Black Hole Gun
Merge branch 'master' of http://github.com/kuykendall-benjamin/School-Project-KNKG
merge conflicts fixed