Stand1

All the files for the stands, remember to customize each stand id, for
time concerns its better to duplicate each stand file to store the id’s
Merge branch 'master' of https://github.com/andresfelipemendez/empleatevalle

Conflicts:
	Principal/client.js
All Stands

Remember to duplicate and customize the id’s of each stand
Merge branch 'camilo'

Conflicts:
	Gruntfile.js
	Principal/client.js
Merge branch 'master' into Felipe
Merge remote-tracking branch 'origin/Felipe' into camilo
salud exit

salud with exit