un poco de color al login
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main/src/main/java/com/example/butiaandroid/main/ConnectActivity.java
	Main/src/main/res/layout/activity_connect.xml
color al login