adds total_price to order confirm page, fixes current_user_is_user
fixed merge conflict in product.rb
Merge pull request #57 from JavaRabbit/display-cleanup

Display cleanup