add sidebar
Merge remote-tracking branch 'up/gh-pages' into gh-pages