untested shooter code, no errors
Merge branch 'master' of https://github.com/Peragore/2013_Refactored.git