Merge branch 'master' of C:\Users\Santiago\Documents\GitHub\Migration with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
-Compilado apk release version 1.0

-Cambios en gradle: se añadio KeyStore