added place ship and associated test
Merge branch 'master' of https://github.com/JoshiiSinfield/battleships

Conflicts:
	Battleships/src/main/java/uk/co/lala/battleships/game/Game.java
added in the place ship test
added in the place ship method