App calculates & displays total price for order
New charges page accurately displays total order price
App has an updated order confirmation page
Confirmation page shows additional information upon checkout
Merge branch 'total_price'

Conflicts:
	app/views/orders/show.html.erb