arreglados problemas de login
Merge remote branch 'origin/Version0.1'

Conflicts:
	code.js