rebase maser lopez
Merge branch 'lopez' of https://github.com/tupini07/HotelCaliforniaExpress into lopez