started to modify Shooter.cpp
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Resolved Conflicts:
	Phoenix2014.h
added switch statement for shooter.cpp
Added encoder code to Shooter.cpp
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Resolved Conflicts:
	Phoenix2014.h
Resolved the rest of the conflicts