Added geotagging to backburner
Merge branch 'master' of github.com:jsonresume/resume-schema
Fixed merge conflict