Fix multicolumn stuff?
Fix commit mess
come on...
Merge branch 'master' of github.com:MareinK/robotica2

Conflicts:
	Report/CONVOI_Project_Report.tex