Ændret links
Changed title
Merge branch 'master' into smidt
Merge branch 'christian' into smidt
Navbar changes
index changes
Merge branch 'christian' into smidt

Conflicts:
	out/assets/stylesheets/main.css
merged hg into smidt
Made index changes
Whatever
Merge branch 'christian' into smidt
Merge branch 'smidt' into christian
aw
made image tranform on index
Fancy bar
Merge branch 'christian' into smidt
Merge branch 'christian' of https://github.com/Smitche/systime-prototype into christian

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

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