added logic and payment information on homepage
merged conflict in show.html.erb