versuch
s Please enter the commit message for your changes. Lines starting

 with '#' will be ignored, and an empty message aborts the commit.
Merge branch 'master' of https://github.com/lecticarius/Robbenkolonie

Conflicts:
	src/de/tu_darmstadt/gdi1/pacman/tests/PacmanTestInterfaceMinimal.java
Merge branch 'master' of https://github.com/lecticarius/Robbenkolonie.git
die testklasse kann raus