search
Merge branch 'master' of https://github.com/zanderdk/P2

Conflicts:
	Rapport/chapters/problemlosning/moduler.tex