Moved to xbox controller for primary
Catapult WIP
Catapult WIP
Merge https://github.com/Xhawk16/FRC-14 into catapult
Cleaned up catapult code and made it compile

Signed-off-by: William Kunkel <will@wkunkel.com>
Converted catapult to use an electromagnet locking mechanism
Updated .gitignore so that git stash -u won't unintentionally delete files
Added fire and arm commands for the catapult
Added command to reverse the direction of the drive on a button press
Changed catapult so that the puller remains down until firing
Added annular sector detection to do lights based on joystick position
Merge branch 'catapult'
Merge branch 'master' of https://github.com/team422/FRC-14

Conflicts:
	src/robot/subsystems/subsystems.cpp
	src/robot/subsystems/subsystems.hpp
	src/robot/user_interface.cpp
Merge branch 'master' of https://github.com/Lukanite/FRC-14.git