merge
Merge branch 'master' of https://github.com/mathiewz/batailleNavalle

Conflicts:
	src/main/java/lpacpi/bataille_navale/Launcher.java