test2 dany
a
Merge branch 'master' of ssh://git@github.com/danybl/biblio.git
Merge branch 'master' of ssh://git@github.com/danybl/biblio.git

Conflicts:
	bibliotheque - 2/Biblio.java