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

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

Conflicts:
	bin/YSMB.apk
	bin/classes.dex
	bin/resources.ap_
er
Merge branch 'master' of https://github.com/larsmh/YSMB

Conflicts:
	bin/YSMB.apk
	bin/classes.dex
display number of bombs left