cleaned up application.html.erb,changed to ruby syntax
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
listing orders associated with a product in the User show page
user can now see what products to ship, incl quantity to be shipped
Search moved and now allows category and user search simultaneously
allows only order owner to view an order
got rid of unncessary comment in order#show
fixed check_user helper method
Merge pull request #41 from Elffers/orders

Orders
Merge pull request #42 from Elffers/search_head

Search moved and now allows category and user search simultaneously
add more seeds
tweak search
remove some extraneous params from view
debug
Merge pull request #43 from Elffers/search_head

Search head
Merge conflict search