test de commit n°2
test de commit n°2
test de commit n°3
Merge branch 'master' of https://github.com/shared1993/Lampe.git

Conflicts:
	src/test/Lampe.java