fix conflicts
[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / robot / Robot.java
2015-11-20 Davidfix conflicts
2015-11-15 Kevin Zhangchange package names