Merge origin/master

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

Conflicts:
	BSD_License_for_WPILib_code.txt
	build.properties
	build.xml
	nbproject/project.bak.xml
	resources/META-INF/MANIFEST.MF
Merge origin/master

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

Conflicts:
	resources/META-INF/MANIFEST.MF
Merge pull request #4 from jacobbelding/master

Pneumatics Update
Delete BSD_License_for_WPILib_code.txt
Delete project.bak.xml
Delete project.xml
Delete build.properties
"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
Merge origin/master
Merge origin/master

Conflicts:
	build.xml
	resources/META-INF/MANIFEST.MF
Added singleControllerMode variable to RobotMap, and cleaned up a lot of gatherer/drivetrain code