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

Conflicts:
	src/Server/Mechanics.java
Merge branch 'master' of github.com:Mats77/FallstudieLISA

Conflicts:
	src/Server/Mechanics.java
Merge branch 'master' of github.com:Mats77/FallstudieLISA