primero actualizen su base de datos primero
add edit habitacion/edit.php
Merge branch 'master' of https://github.com/yeisonherbert/SistemaHotel

Conflicts:
	application/views/sistema/sistema_header.php