så?
Merge branch 'master' of https://github.com/gustav9797/Cheese_Multiplayer

Conflicts:
	src/App.cpp
	src/App.h
	src/Connection.cpp
	src/Connection.h
	src/Entity.cpp
	src/ServerConnection.cpp
	src/TextureContainer.cpp
	src/cheese edits.vcxproj
	src/main.cpp