Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist

Conflicts:
	.gitignore
	2014RobotCode/nbproject/private/private.xml
Some weird xml files
Added AutoDrive command and thread, have yet to put it in autonomous.