commit second version funciona
Poner excepcion para error sintaxis
Merge branch 'master' of https://github.com/martitra/user_login_v2.git

Conflicts:
	bin/R.txt
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/user_login/MainActivity.class
	bin/classes/com/example/user_login/R$id.class
	bin/classes/com/example/user_login/R$integer.class
	bin/classes/com/example/user_login/R$layout.class
	bin/classes/com/example/user_login/R$menu.class
	bin/classes/com/example/user_login/R$string.class
	bin/classes/com/example/user_login/R$style.class
	bin/classes/com/example/user_login/R$styleable.class
	bin/classes/com/example/user_login/UserLogin.class
	bin/classes/com/example/user_login/UserLoginAccesoOkActivity.class
	gen/android/support/v7/appcompat/R.java
	gen/com/example/user_login/R.java
	res/layout/activity_acceso_ok.xml
	res/values/strings.xml
	src/com/example/user_login/MainActivity.java
	src/com/example/user_login/UserLogin.java