styling
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scss/main.scss
	stylesheets/main.css
Merge pull request #17 from NicoleA/master

Handbook sidebar styles