Merge branch 'gh-pages'
bio and cv changes
Merge branch 'master' into gh-pages