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

Conflicts:
	.gitignore