Merge branch 'master' of https://github.com/ethanhuey/612-2014

Conflicts:
	Shooter.cpp
	Shooter.h
	main.cpp
one more fix
Merge branch 'master' of github.com:anidev/612-2014
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014