Merge remote-tracking branch 'origin/Felipe' into camilo
salud exit

salud with exit
Merge remote-tracking branch 'origin/Felipe' into camilo
servicios

servicios
Merge remote-tracking branch 'origin/camilo' into Felipe

Conflicts:
	Principal/client.js