Anpassungen
Merge branch 'master' of https://github.com/KajetanMischok/Battleships

Conflicts:
	src/de/frupek/battleships/Battle.java