Fixer main file
Merge branch 'master' of https://github.com/2-1-48-Git/2-1-48

Conflicts:
	Projektskabelon/Rapport/2_1_48_Rapport.tex
Merge branch 'master' of https://github.com/2-1-48-Git/2-1-48
Redigere Acitivity