Merge branch 'gh-pages'
edited story and changed line-height
Merge branch 'master' into gh-pages