Merge pull request #39 from Elffers/orders

Orders
cleaned up application.html.erb,changed to ruby syntax
refactored product show
Merge branch 'master' into orders
update html in user show page
can now view old orders, still want to condense pending orders into current order