Added ammo. Moves win condition checks to better location
Fixed merge conflicts. Added stubs for methods and did some refactoring in Engine class.