Added the payment-reservation page.
Cleaned up the Database controller. Database getList method is now
a little more robust. It handles errors cleaner. Also added a method
for getHotelInfo. Will continue to implement this. It currently only
returns the size of the Amenities list to the view.
Added some styling to the getList view to make the hotel descriptions more aesthetic.
Merge remote-tracking branch 'origin/zach_branch' into caleb_branch

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb
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
Added Tracy's payment page. Made a few styling modifications.
Merge branch 'zach_branch'

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb
Removed git meta-text
Added rudimentary reservation functionality and connected payment form to payment validation.
Merge remote-tracking branch 'origin/zach_branch' into caleb_branch

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb
Added thumbnail URL to hotel object.
Merge branch 'master' of https://github.com/zakattax/180Project into caleb_branch

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb
Merge branch 'caleb_branch'

Conflicts:
	ucr_hbs/app/controllers/database_controller.rb
	ucr_hbs/app/views/database/getList.html.erb
Search template + hotel template made.

Needs to be fine tuned but general template is there
Fixed hotel page/ remove reviewing
Final change
Last work on Monday
Merge branch 'master' of https://github.com/zakattax/180Project into Sam_Branch
Added confirmation page
Merge branch 'master' of https://github.com/zakattax/180Project into tracy_branch

Conflicts:
	ucr_hbs/config/routes.rb