changes to users
changed cart to my cart and orders formatting
working current_user
Merge pull request #34 from lizrush/layout

Layout
adds dynamic nav in header for cats and users
merged users
merge master into show layouts
Merge pull request #35 from lizrush/show_styling

Show styling
updated with sue's current user
Merge branch 'master' of github.com:lizrush/congo into orders

Conflicts:
	db/schema.rb
merge
database prep for heroku
add production db file
fixed categories; user can shop products by category, but without pics
Merge pull request #36 from lizrush/layout

Layout
more orders stuff
update readme
fixed merge conflicts
Merge branch 'master' of github.com:lizrush/congo into orders
fixed indentations and alignments on  views and controllers