not sure what i should say
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Resolved Conflicts:
	Shooter.cpp
	Shooter.h