END X2
Merge branch 'master' of https://github.com/thomasgaillard/gestionAgendas

Conflicts:
	Perso.ics
	Pro.ics