dealer talk
Merge branch 'master' of git@github.com:alexandrovsky/bad_trip.git

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