commita bara  fungerande kod1
uSxh
Merge branch 'master' of https://github.com/gustav9797/Cheese_Multiplayer_Fix

Conflicts:
	src/World.cpp
	src/World.h