Adding timeout on server
Merge branch 'master' of https://github.com/arn3tt/WarOfKingdoms