local commit
Merge branch 'master' of https://github.com/jcordero-git/Food-Providers

Conflicts:
	Frontend/app/login/login.html
	Frontend/app/partials/index.html