#FileIn - ihm
#FileIn
Merge branch 'master' of https://github.com/zives/ISTIC-M2GL-Grp1-Projet

Conflicts:
	synthlab/src/main/java/group1/project/synthlab/workspace/Workspace.java