Updated resume json
Merge branch 'master' into gh-pages

* master:
  Updated resume json