new changes to shooter and launcher
Merge branch 'master' of git://github.com/AlexMaxseiner/612-2013 into alex

Conflicts:
	shooter.cpp
	shooter.h
Line endings
Merge branch 'master' of github.com:anidev/612-2013