a
Merge branch 'master' of github.com:jbouchet/NavalWar

Conflicts:
	.idea/workspace.xml
	app/src/main/res/layout/activity_my.xml