Merge branch 'christian'
Merge branch 'master' of https://github.com/Smitche/systime-prototype

Conflicts:
	out/index.html
	src/layouts/default.html.jade