Merge branch 'master' into gh-pages
Corrected story
Merge branch 'master' into gh-pages
New stories
Merge branch 'gh-pages'