login quemado
Merge branch 'master' of https://github.com/jadiosa/appgym-udea-web

Conflicts:
	app/scripts/login.js