Hola, mi primer commit .....
Merge branch 'master' of https://github.com/yeisonherbert/SistemaHotel

Conflicts:
	application/config/database.php