broke
Merge branch 'master' of https://github.com/alexandrovsky/bad_trip

Conflicts:
	bad_trip_game/src/de/uni/bremen/screens/PlayScreen.java
Merge branch 'master' of https://github.com/alexandrovsky/bad_trip

Conflicts:
	bad_trip_game/src/de/uni/bremen/screens/PlayScreen.java