I'm committing to pull
resolved and fixed Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Conflicts:
	Shooter.cpp