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

diff --combined .gitignore
index 7a58fe3c2db27e307ab487fba75f910d2ce3bf69,0686dad847402fbf6a328b8b8fda535f9e62358f..dc8e203a70f816ab5940294cffd44045fb13c78e
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,15 -1,15 +1,18 @@@
 +<<<<<<< HEAD
  # -*- mode: gitignore; -*-
  *~
  \#*\#
  .\#*
 +=======
 +>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
  *.pydevproject
  .metadata
  .gradle
  bin/
  tmp/
+ build/
+ dist/
+ sysProps.xml
  *.tmp
  *.bak
  *.swp
@@@ -46,8 -46,4 +49,8 @@@ local.propertie
  .texlipse
  
  # STS (Spring Tool Suite)
 +<<<<<<< HEAD
  .springBeans
 +=======
 +.springBeans
 +>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e