index e image_slider antes commit shiryu
Merge branch 'master' of https://github.com/anajuliapc/golpecomunista

Conflicts:
	index.php
	scripts/image_slider.js
Merge branch 'master' of https://github.com/anajuliapc/golpecomunista

Conflicts:
	index.php