Refactored ocean - initialise method
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/battleship/BattleshipGameController.java
Merge branch 'master' of https://github.com/mbragg02/Battleship
Piratical Artword. YEah
Merge remote-tracking branch 'origin/master'