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

Conflicts:
	SkillsManagement/src/Main.java