Git ignore :D
Merge branch 'master' of
ssh://git@github.com/mxbeaulieu/maintenance_biblio.git

Conflicts:
	bibliotheque - 7/.gitignore