Theory to Guarantee shift temp Fanny
Last Day Fanny No.1
Merge branch 'master' of https://github.com/pcmoritz/traffic-project

Conflicts:
	doc/report.tex
	parameters.m
Whatever