gitignore
modif
Intégration des vidéos
Corrections mineures
Merge branch 'dev'

Conflicts:
	.gitignore
	Config/config.inc
	Includes/.DS_Store
	Includes/souvenirs/.DS_Store
	Templates/souvenirs/.DS_Store