Fixed merge
Merge branch 'master' of https://github.com/bagvendt/SAD2_Project
Merge branch 'master' of https://github.com/bagvendt/SAD2_Project

Conflicts:
	report/rapport.tex