Q : Rollback (At least i tried)
Merge branch 'master' of https://github.com/PiglooPOO/StudentManagerProject

Conflicts:
	EclipseProject/src/fr/upem/projectJava/studentManagerProject/Main.java