Merge branch 'master' into smidt
Merge branch 'christian' into smidt
index changes
Merge branch 'christian' into smidt

Conflicts:
	out/assets/stylesheets/main.css
merged hg into smidt
Made index changes
Merge branch 'christian' into smidt
Merge branch 'smidt' into christian
Merge branch 'christian' of https://github.com/Smitche/systime-prototype into christian

Conflicts:
	out/index.html
	src/documents/index.html.jade