algo de category
Merge branch 'master' of https://github.com/vicenteguerra/losimaginantes.mx

Conflicts:
	style.css