Letzte Korrektur
Merge branch 'master' of https://github.com/PeterPetrel/KeepCool

Conflicts:
	src/de/fernuni/keepCool/client/elements/Standard4PlayerRules.java
Merge branch 'master' of https://github.com/PeterPetrel/KeepCool

Conflicts:
	src/de/fernuni/keepCool/client/elements/Standard4PlayerRules.java