Login Screen
Merge branch 'master' of https://github.com/leomindez/Amigos

Conflicts:
	AmigosApp/app/build.gradle
	AmigosApp/app/src/main/java/com/amigos/LoginActivity.java
Changes
Merge branch 'master' of https://github.com/leomindez/Amigos