Dev 2 commit msg
comiit project
Merge remote branch 'origin/master'

Conflicts:
	.project
	Projet_Java_Test2/src/Acceuil.java