added punch spaghetti to shooter
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014 into test
Fixed Ben's compile errors
Merge branch 'master' into mergeTest

Conflicts:
	Shooter.cpp
	Shooter.h
	main.cpp
	ports.h