des logs...
Merge branch 'master' of https://github.com/neowutran/projetFinalSI3

Conflicts:
	.classpath