remerge
Remove junk
Merge branch 'master' of https://github.com/jeanguyomarch/RealTimeLabs

Conflicts:
	lab3/lab_report/report.tex