cambiuky
Merge branch 'master' of https://github.com/yoshuadiaz/Biblioteca-D

Conflicts:
	css/style.css
	js/bibliodigital-gen.js
	js/bibliodigital.js
	styles/style.styl