Neuer Test
Merge branch 'master' of github.com:Mats77/FallstudieLISA

Conflicts:
	src/Server/LOESCHMICH.java