Arreglo
Merge branch 'master' of https://github.com/karlosgliberal/pausoka_oinez

Conflicts:
	www/index.html