minor changes
nothing special
Merge branch 'master' of https://github.com/alexandrovsky/bad_trip

Conflicts:
	bad_trip_game-desktop/bin/de/uni/bremen/Main.class
Merge branch 'master' of https://github.com/alexandrovsky/bad_trip