Meilenstein
asdasd
opa schwebt
Merge branch 'master' of https://github.com/daviddos92/beat into le_nnart

Conflicts:
	src/general/Character.java
	src/general/ChoosePlayerMode.java
	src/general/Menu.java
	src/general/Position.java
	src/general/Status.java
	src/general/Weapon.java
	src/general/ingame.java
option menü dingens