gemerged
Merge branch 'master' of https://github.com/benjaminKeck/Haskell_Schiffeversenken

Conflicts:
	src/War.hs