Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
added support for theroku to the app
Merge branch 'heroku-support' into dev
Merge branch 'dev'
fix https vs http bug
fix an issue where topojson wasn't being loaded
Merge branch 'temporary-fix' into dev
removed a reference fo the topojson file
Merge branch 'temporary-fix' into dev