vamos a iniciar

Change-Id: Ibd31a108cf691f20b626f2d596700a0f6e22c711
Signed-off-by: alex <alex@alex-IBLINK>
Merge branch 'hg' of https://github.com/iscalejandrogr/HOTELBD.git into
hg
Merge branch 'master' into hg

Conflicts:
	js/API/servidor.js
Merge branch 'hg' of https://github.com/iscalejandrogr/HOTELBD.git into hg