Some sort of grid ready
grid stuff
Merge branch 'master' of https://github.com/GlasgowCaley/Battleships-IP2014

Conflicts:
	src/uk/ac/gcu/battleships/view/GameController.java