update nav bar
update color
Merge branch 'master' of https://github.com/mackeyzheng/bookworm

Conflicts:
	assets/js/sideBar.js