Added ammo bar
Fixed conflict
Merge branch 'master' of github.com:csulbacm/LavaWhales