Add control input on colomnInput
Merge remote-tracking branch 'origin/master'

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