edited about page
Merge branch 'master' into gh-pages
new story
Merge branch 'master' into gh-pages