GameScreen almost done. Started working on placement
Merge branch 'develop' of https://github.com/Bipshark/TDA367 into feature/placement

Conflicts:
	desktop/src/main/java/edu/chalmers/sankoss/desktop/mvc/game/GameModel.java
	desktop/src/main/java/edu/chalmers/sankoss/desktop/mvc/game/GameRenderer.java
	desktop/src/main/java/edu/chalmers/sankoss/desktop/mvc/mainMenu/MainMenuModel.java
	desktop/src/main/java/edu/chalmers/sankoss/desktop/mvc/placement/PlacementRenderer.java
Placement almost done
Added ship to shipImage and added rotation feature in ship
Finished the basics for placement
Merge branch 'develop' of https://github.com/Bipshark/TDA367 into feature/placement
Fixed test to fit new feature
Merge branch 'feature/placement' into develop