Funcionando el buser
Merge branch 'master' of https://github.com/Grupo-UPE/Laboratorio

Conflicts:
	public/js/app/controllers.js