eksamenshejs 1
Merge branch 'master' of https://github.com/Saxit/Afgangsprojekt-2014

Conflicts:
	Rapport/Rapport/Rapport.docx