organizando cambios

:S
Merge branch 'master' of https://github.com/GaroX/Manuvo

Conflicts:
	index.html
cambios

:S