Fixed stuff and the stuff with the ammo.
Merge branch 'master' of github.com:csulbacm/LavaWhales