Stuff
Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist
Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist
Pneumatic controller support
Pneumatics xbox support
Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist

Conflicts:
	.gitignore
	2014RobotCode/nbproject/project.bak.xml
	Racetrack/nbproject/private/private.properties