FIIIIIIIIIIIIINAL commit
Merge branch 'master' of https://github.com/Avgiftsjuntaen/Prosjektrapport

Conflicts:
	Prosjektrapport.pdf
added appendices