aw
Fancy bar
Merge branch 'christian' of https://github.com/Smitche/systime-prototype into christian

Conflicts:
	out/index.html
	src/documents/index.html.jade
Merge branch 'christian' into smidt

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