Basic game works, gun added(Script needs work)
Merge branch 'master' of https://github.com/Derpe/Unity_summer_project