Broke the game class, fixed it
Merge branch 'master' of https://github.com/GlasgowCaley/Battleships-IP2014

Conflicts:
	src/uk/ac/gcu/battleships/Game.java