tg
Merge branch 'master' of https://github.com/Kevin445/Derniere_semaine_intensive

Conflicts:
	.DS_Store