Modification contradictoire
oMerge branch 'master' of github.com:JulietteS/Statapp

Conflicts:
	test.py