ASDFGJKLÖÄ
Merge branch 'master' of https://github.com/DDIUniHeidelberg/Konstanz

Conflicts:
	WUERFEL.class