Merge remote-tracking branch 'origin/gh-pages'
more content, added localscroll, scroll to top
finished needed content
Merge remote-tracking branch 'origin/master' into gh-pages