server modification
Merge branch 'master' of github.com:orchidproject/Location-game-orchid