actualizando
Merge remote-tracking branch 'origin/master'

Conflicts:
	LoginTest/src/com/example/chances/LoginHActivity.java