tata
Merge origin/master

Conflicts:
	src/laboratoire/Laboratoire.java