plop
Merge branch 'master' of https://github.com/drdeath86/comicsdealer

Conflicts:
	js/catalogo.js