Wollen Test
Merge branch 'master' of https://github.com/Lusito/GameDevWeek

Conflicts:
	gdx-kitten-rescue/src/main/resources/data/maps/Katzenklappentest.tmx