Salas.
Merge branch 'master' of github.com:mcmtroffaes/bibliography

Conflicts:
	all.bib