Merged
Merge branch 'smidt'
Made systime as home link
Merge branch 'christian'
Merge branch 'master' of https://github.com/Smitche/systime-prototype

Conflicts:
	out/index.html
	src/layouts/default.html.jade
fjernet head
ultimate version
Merge remote-tracking branch 'origin/master' into Flemming

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