Cambio de diseño
Merge branch 'master' of https://github.com/ssalazars/Catalogos

Conflicts:
	.DS_Store