fix conflicts
[3501/2015-FRC-Spark] / build.xml
2015-11-13 Kevin ZhangClean Up Code for FRC 3501-Spark Code: Restructure...