Merge branch 'gh-pages'
top margin and sidebar button
Merge branch 'master' into gh-pages