fix conflicts
[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / subsystems / Claw.java
2015-11-20 Davidfix conflicts
2015-11-15 Kevin ZhangChange to 2 space instead of 4 space per Danny's request cb/master
2015-11-15 Kevin Zhangchange package names
2015-11-13 Kevin ZhangClean Up Code for FRC 3501-Spark Code: Restructure...