From: David <david.dobervich@gmail.com>
Date: Fri, 20 Nov 2015 18:37:17 +0000 (-0800)
Subject: Merge branch 'master' of challenge-bot.com:repos/3501/2015-FRC-Spark
X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=HEAD;hp=eb9e6bd8da48f0833680f6e6705542bacacd4dd8;p=3501%2F2015-FRC-Spark

Merge branch 'master' of challenge-bot.com:repos/3501/2015-FRC-Spark
---

diff --git a/.gitignore b/.gitignore
index 7a58fe3..dc8e203 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 .gradle
 bin/
 tmp/
+build/
+dist/
+sysProps.xml
 *.tmp
 *.bak
 *.swp