Server displays Map
Merge branch 'master' of https://github.com/robinvierich/ece458