added end to products controller
user edit page works
user edit form has errors (the good kind)
Merge pull request #11 from JavaRabbit/product-show

Product show
fixed merge conflict
adding user info for home page
fixing conflicts on prod control
fixed merge conflict in routes.rb
Merge branch 'usersedit'
fixed conflicts
fixed user controller info to local branch
fixed merge conflict in userscontroller
Merge branch 'home'
Merge branch 'master' of github.com:JavaRabbit/UselessJunk
adds in stock/out of stock to products show