edits to sidebar and newsfeed + new styles
Merge branch 'master' of https://github.com/Eric-Jr/khi-redesign

Conflicts:
	css/custom.css

Errors:
	Take this out -

		<<<<<<< HEAD

		============

		>>>>>>> FETCH_HEAD