merge
Merge branch 'master' of ssh://git@github.com/alexandrovsky/bad_trip.git
sdijfiosd
Merge branch 'master' of ssh://git@github.com/alexandrovsky/bad_trip.git

Conflicts:
	bad_trip_game/src/de/uni/bremen/entities/Character.java
ANIMATION UPDATE