swapped a few lines in server main
Merge branch 'master' of https://github.com/skortchmark9/riMap