Metodos Vidal
Merge branch 'master' of ssh://git@github.com/Codiapps/Test.git

Conflicts:
	index.py