modif Lorinda
Merge branch 'master' of github.com:M2-BlaBla/Double

Conflicts:
	 blopdocument