state order changed
Merge branch 'master' of https://github.com/alexandrovsky/bad_trip

# By jankapunkt
# Via jankapunkt
* 'master' of https://github.com/alexandrovsky/bad_trip:
  added
  map update
  added to repo

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

# By Inga Brehm
# Via Inga Brehm
* 'master' of https://github.com/alexandrovsky/bad_trip:
  get curent health added
  healthbar added

Conflicts:
	bad_trip_game/src/de/uni/bremen/screens/PlayScreen.java
enemy
minor
items are seen