im
Merge branch 'master' of https://github.com/Haurum/P1

Conflicts:
	Turister/Matematik teori.docx