okay this actually works
Merge branch 'master' of https://github.com/kscottz/FirstMotorDriver

Conflicts:
	Robot830/PPC603gnu/Robot830/Debug/Robot830.out
	Robot830/ShooterPrototype.cpp