orth
Merge branch 'master' of github.com:TriComp/Documents

Conflicts:
	final-report/rapport.tex