planning.sql corrigé
Merge branch 'master' of github.com:gaultier/projet_pierre

Conflicts:
	SQL/planning.sql
Correction planning.sql
Merge branch 'master' of github.com:gaultier/projet_pierre