Never say it isn't perfect
Well
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cameras/Fagprojekt.docx