updated hotel controller
Merge branch 'master' of https://github.com/TrevorMW/LRSGEN-rails

Conflicts:
	app/controllers/hotel_controller.rb
updated hotel controller
Merge pull request #2 from TrevorMW/update-controller

Update controller