Modified to use sidebars.

Pushed to different branch, as per MH suggestion.
Merge branch 'sidebars' into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages'