boulot ismail re
Merge remote-tracking branch 'origin/Interface' into Interface

Conflicts:
	com/stcal/Main.java
Merge remote-tracking branch 'origin/Interface' into Interface
Choix du jour
Merge remote-tracking branch 'origin/Interface' into Interface
Merge remote-tracking branch 'origin/Interface' into Interface

Conflicts:
	com/stcal/fen/FCal.java
Update Main.java
Merge remote-tracking branch 'origin/Interface' into Interface
Choix du jour
Merge remote-tracking branch 'origin/Interface' into Interface
test