evaluation s4
Merge branch 'master' of https://github.com/Thalmann/swf613-rapport
future works
Merge branch 'master' of https://github.com/Thalmann/swf613-rapport

Conflicts:
	main.tex