Turrets can fire, but bullets don't move.
Merge branch 'master' of https://github.com/michaelteckcahting/csc309-a3

Conflicts:
	application/controllers/combat.php
Bullet animations are working.
Bullet hit detection works.
Fixed bug of game not ending properly.
Game ending and starting bugs fixed.