merge player with boat on master
Refactor board and boat
Merge branch 'master' of https://github.com/Maftl/bataillenavale

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