Stuff
No idea how git works
Merge branch 'master' of https://github.com/Mrostgaard/Kaffeklubben

Conflicts:
	Rapport/Rapport.tex