comit innesesario
Merge branch 'master' of https://github.com/zeekChile/bd13

Conflicts:
	js/main.js
	login.php