hemmelig commit
Merge branch 'master' of https://github.com/anbae12/Semesterprojekt-F14

Conflicts:
	Rapport/content/Mikrocontroller.tex