Fixed Grabber.cpp and Grabber.h and changed Shooter.cpp and Shooter.h
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Conflicts:
	Grabber.cpp
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014
merged
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014
Added constants to Shooter.cpp