trololol
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
hest
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/ModelIdHolder.cpp
I made nothing.
I made nothing, again.
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/ClientHandler.cpp
	GameClient/ModelIdHolder.cpp
	GameClient/models/House00/House00.BFish
	GameClient/models/House01/House01.BFish
	GameClient/models/House02/House02.BFish
	GameClient/models/House03/House03.BFish
	GameClient/models/House04/House04.BFish
	GraphicsEngine/GraphicsHandler.cpp