Continued working on map
Merge branch 'master' of https://github.com/krazemon/arctic

Adding pseudo-data
Pulling data from Parse