Solucionando error (intersection)
Merge branch 'master' of https://github.com/VetHeroes/vetcrm

Conflicts:
	api/controllers/BranchController.js