Je vais regler un conflit, wesshhh
Merge branch 'master' of https://github.com/Gnuk/ScrumDashboard

Conflicts:
	src/model/Projet.java