Commit para hacer pull (ningun cambio)
Merge branch 'anto' of https://github.com/AkaAnto/jardines_altamar into ana

Conflicts:
	static/css/css.css
Merge branch 'anto' of https://github.com/AkaAnto/jardines_altamar into ana

Conflicts:
	static/css/css.css
Colocando imagenes index
Merge branch 'ana' of https://github.com/AkaAnto/jardines_altamar into anto
refactor imagenes