Creating template
cambio agregado para github remote
Merge branch 'master' of github.com:jvinceso/sistemahotelero

Conflicts:
	README.md