add sidebar styling
Merge branch 'master' of github.com:sammyamiller/test.dev

Conflicts:
	style.css

Merged files successfully