test
Merge branch 'master' of github.com:Bluemriine/BatailleNavale

Conflicts:
	app/src/main/java/bluemriine/bataillenavale/Dessin.java