merge conflict in gemfile
added view link to all pages except order page
add price and description to view page