Merge branch 'master' of https://github.com/HR-Data-Geyser/Data-Geyser into develop
commented globe.js
fixed merge conflicts
Merge branch 'develop' of https://github.com/HR-Data-Geyser/Data-Geyser into develop
Merge pull request #128 from stevejs/develop

adds comments to globe.js