Merge branch 'christian' into smidt

Conflicts:
	out/assets/stylesheets/main.css
	out/chapters.html
cool
chapters