added markers and clustering
Merge pull request #19 from bobolinks-2014/map-display

added markers and clustering
fixed merge conflicts in app.js