maps stuff
fixed merge error.  changed map render.
Merge branch 'master' of github.com:jjlee5266/Where-Fi