Test
Lampadaire
Merge branch 'master' of
ssh://git@github.com/mxbeaulieu/maintenance_biblio.git

Conflicts:
	bibliotheque - 0/Biblio.java