Commit inicial FMentado
Merge branch 'rama1' of https://github.com/flmentado/cagesa into ramaFmentado
Segundo commit
Slider con fotos de jardineria
Merge remote-tracking branch 'origin/ramaFmentado' into rama1

Conflicts:
	cagesa/web/index.html
	cagesa/web/index.jade
commit despues del pull