pre-final commit
Merge branch 'master' of https://github.com/arsalion/Joyride
Almost final commit, just need to populate map
pre json retrieval
Tried to fix merges, hope this didn't fuck up