se ve la carita
ya
Merge branch 'master' of https://github.com/lerv22/MonitorBases

Conflicts:
	MonitorBases/web/session/dashboard.jsp
Merge origin/master

Conflicts:
	MonitorBases/web/js/scripts.js
	MonitorBases/web/session/dashboard.jsp