ardillas  en el login
Merge branch 'master' of heroku.com:webappteam

Conflicts:
	views/login.html
Merge branch 'master' of https://github.com/webapp-fpi/store