promotion
Merge branch 'master' of https://github.com/debflav/scrum
promo
fix conflict
add etudiant in promotion
gestion promo
fix conflict