Edit report, proof read
Merge branch 'dev' of github.com:everharder/ColorTracking into dev

Conflicts:
	doc/Report_Canella_Eberharter_Haas_Haselwanter.tex