update
update
update
update
Meilenstein 2.8
Merge branch 'master' of https://github.com/GerhardK90/Gruppe46

Conflicts:
	level/3/0.lvl
	src/Network/Client.java
	src/Network/NetworkGame.java
	src/Network/Server.java
	src/controller/ControllerSpieler.java
	src/controller/ControllerSpieler2.java
	src/ludigame/Game.java
	src/models/Player.java
	src/models/Spieler.java
	src/views/ViewEnemy.java
Merge branch 'master' of https://github.com/propra13-orga/gruppe46
delete