traits, update phys res upgrade
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
yuguiguiygu
waddapigotabigcock
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/STATISTICSlastgame.txt