sounds added
Merge commit '26f14e6015dcd3a14e1464d0da8d3eae808b4c9d'

* commit '26f14e6015dcd3a14e1464d0da8d3eae808b4c9d':
  sounds added

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

# By jankapunkt
# Via jankapunkt
* 'master' of https://github.com/alexandrovsky/bad_trip:
  kill entities