Client upgrade sortof
asdfasdf
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	.gitignore
	GameClient/client.h
ashfi