hotelViewCOntroller & excursionViewController
HotelController & Excursion Controller
cleaning
merging
Merge branch 'zirui_branch'