tyr

rt
Merge branch 'master' of https://github.com/Cyril-/PolyLog

Conflicts:
	Diagrammes Activité/Réservation.uml
Merge branch 'master' of https://github.com/Cyril-/PolyLog