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

Conflicts:
	bootstrap/css/comicsD.css
	js/index.js