detalles
Merge branch 'master' of https://github.com/adrielzarate/castillo-de-molina

Conflicts:
	css/main.css