alte dateien geadded
Merge branch 'master' of https://github.com/benjaminKeck/Haskell_Schiffeversenken

Conflicts:
	src/Client.hs
	src/Server.hs
gemerged