more edits to sidebar
finished index.html
test
submission
Merge branch 'gh-pages'

Conflicts:
	assets/css/style.css
	index.html
	search.html