Modified shooter shifter and ports
Merge branch 'master' of https://github.com/BenNgu/612-2014

Conflicts:
	Shifter.cpp
	Shooter.cpp
	ports.h