style handout
Merge branch 'master' of https://github.com/sevenval/odl-thek

Conflicts:
	public/stylesheets/style.css