Shooter Changes
Merge branch 'master' of https://github.com/anidev/612-2013
Formatting and launcher stuff
Merge branch 'master' of git://github.com/JeffTolbert/612-2013 into jeff

Conflicts:
	launcher.h
Merge branch 'jeff'

Conflicts:
	612.h
	launcher.cpp