Merge branch 'master' of C:\Users\Angèle\Desktop\GitHub\ProjetGL_ABSTEM with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Main.java
	src/Timer.java
Modif Timer pour péremption
Ajout GestionBDD supprimePerime