fixed sidebar - closed #12, #13, #14, #15, #16
Merge branch 'master' of https://github.com/kaspar-naaber/oslo-praktika

Conflicts:
	html/content.html
	html/home.html
	stylesheets/main.css