Re-ask boat placement if is in another boat
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/battleShip/Player.java