modif
Modif
Merge branch 'master' of https://github.com/chomarac/Lampe.git

Conflicts:
	src/Main.java