more documentation work
Merge branch 'master' of https://github.com/pcmoritz/traffic-project

Conflicts:
	doc/report.tex
Merge branch 'master' of https://github.com/pcmoritz/traffic-project
finish Ben proof