Premier commit
Merge origin/master

Conflicts:
	src/laboratoires/Laboratoires.java