Implemented the getHotelInfo method for the database controller.
This method returns a hotel object with all the info neccessary
to populate the hotel page. This includes: amenities(features) and
pictures. I also created a new view page, hotelInfo. This is just an
example of how to retrieve data from the hotel object that I created
in the getHotelInfo method
Merge remote-tracking branch 'origin/zach_branch' into caleb_branch

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb