Merge battleship/master

Conflicts:
	src/battleship/Battleship.java