Retest
Merge remote-tracking branch 'origin/master'

Conflicts:
	notes.md
Merge branch 'master' of http://aws.hassankeskin.fr/hassankeskin/vicc_project
Modification de notes.md