server works
Merge branch 'master' of https://github.com/echaddock/RockMyWorld