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
Added Tracy's payment page. Made a few styling modifications.
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