version 2
Signed-off-by: Julien le Van Suu <levansuu@polytech.unice.fr>
Merge branch 'master' of https://github.com/bigjulien/mmreport.git

Conflicts:
	report3.tex

Signed-off-by: Julien le Van Suu <levansuu@polytech.unice.fr>