Added Alternative Shifting Mechanism
Update run_motor.hpp

Formatting fix; extra space added
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
Added Click to Alliance Color
Merge pull request #10 from Lukanite/master

Added Click to Alliance Color Lights