Player
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/classes/com/tdt4240/yousunkmybattleship/Ship.class
Merge branch 'master' of https://github.com/larsmh/YSMB
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/classes/com/tdt4240/yousunkmybattleship/Player.class
	src/com/tdt4240/yousunkmybattleship/Player.java
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/classes/com/tdt4240/yousunkmybattleship/Ship.class
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/classes/com/tdt4240/yousunkmybattleship/Ship.class
	src/com/tdt4240/yousunkmybattleship/Ship.java