minor changes
Merge branch 'master' into routes
Gmaps kinda working, some routing done. Performance Artists not associating.
fixed merge conflicts
Merge pull request #16 from mikewong79/routes

Routes