commit
jk
Merge branch 'master' of
https://github.com/imie-source/CDPN02-GestComp-G2.git

Conflicts:
	SkillsManagement/bin/Main.class