Changes in order to enable hit
Changes to game and main
changes to the main class, fixing some of the merge conflicts