weird
Merge branch 'master' of https://github.com/PiglooPOO/StudentManagerProject

Conflicts:
	EclipseProject/bin/fr/upem/projectJava/studentManagerProject/Formation.class
	EclipseProject/bin/fr/upem/projectJava/studentManagerProject/Main.class
	smp.sql