Merge branch 'master' into gh-pages
local profile photo
Merge branch 'gh-pages'