made insignificant changes to controllers

put configuration back to way it was at prior commit
Merge branch 'master' of github.com:gstraehle/project_2_store
immaterial changes to controllers
Merge branch 'master' of github.com:gstraehle/project_2_store
fixed counter in cart preview
fixed counter in checkout
Added total to cart view, deprecates with removal

needs to be reformatted for $
Merge branch 'master' of github.com:gstraehle/project_2_store

Conflicts:
	app/views/products/index.html.erb
refactored counter deprecation in view cart
fixed counter after merge

Merge branch 'master' of github.com:gstraehle/project_2_store

Conflicts:
	app/views/orders/show.html.erb
Merge branch 'master' of github.com:gstraehle/project_2_store
made simple box around checkout price

needs to be formatted to $
Merge branch 'master' of github.com:gstraehle/project_2_store

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