comienzos del carrusel...
Merge branch 'master' of https://github.com/joseramonc/webuady

Conflicts:
	functions/globals.php
	index.php
test