Next to nothing
Merge branch 'master' of https://github.com/lanatra/Battleship

Conflicts:
	implementations/Battleships.java
	terminatorplayer/TerminatorPlayer.java