Added firing to game.
Resolving merge conflicts.