Æ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
merged smidt into flemming