using Players from Constants in ShipPlacement
pictures
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/YSMB.apk
	bin/classes.dex
	bin/classes/com/tdt4240/yousunkmybattleship/Constants.class
	bin/classes/com/tdt4240/yousunkmybattleship/Player.class
	bin/classes/com/tdt4240/yousunkmybattleship/ShipType.class
	bin/classes/com/tdt4240/yousunkmybattleship/state/MainMenuState.class
	bin/classes/com/tdt4240/yousunkmybattleship/state/SettingsState.class
	bin/classes/com/tdt4240/yousunkmybattleship/state/ShipPlacementState.class
	bin/resources.ap_
	src/com/tdt4240/yousunkmybattleship/Constants.java
	src/com/tdt4240/yousunkmybattleship/state/MainMenuState.java
	src/com/tdt4240/yousunkmybattleship/state/ShipPlacementState.java
pictures