maj biblio
Merge branch 'master' of https://github.com/Pingolus/3djeca

Conflicts:
	BiblioECA/biblio.tex