Removed carousel on the home page. Also linked error page back to the
home page
Removed carousel on the home page. Also linked error page back to the
home page
Added reviews # as well as star level to each hotel on the
Hotel List page.
Merge branch 'zach_branch' of https://github.com/zakattax/180Project into zach_branch

Conflicts:
	ucr_hbs/app/views/welcome/index.html.erb
Merge branch 'master' of https://github.com/zakattax/180Project into caleb_branch2