rfrffgv
edcvsdv
cc
qDF
Merge branch 'master' of https://github.com/LoicJulien/Test.git

Conflicts:
	test/src/test/Lampe.java