Server without sessions working properly
Merge branch 'master' of https://github.com/arn3tt/WarOfKingdoms

Conflicts:
	server/server.js