"fixing" stuff
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Added gatherer sub/int/command. Rewrote Solenoid code for testing "old" solenoids
Added singleControllerMode variable to RobotMap, and cleaned up a lot of gatherer/drivetrain code
Fixed SingleControllerMode (now a method in OI).
commit
commit
Merge origin/master
commented stuff
commented stuff
deleted edu
Added Gyro and Ultrasonic (working), Displaying values to SmartDashboard
Merge branch 'master' of https://github.com/BadRobots1014/BadRobot2014.git
Merge origin/master
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
some small space thing
added TurnRobot to turn the robot
added DriveStraightForward command
changed tracked files