orders moved over to dashboard
Merge branch 'text-footer'
Moves users to dashboard
Fixes merge conflicts
Fixes merge conflicts
Merge branch 'master' of https://github.com/tyrbo/the_pivot
fixes prices for updating items
updates add to cart buttons and qty boxes on items page
added logo to nav bar
Merge branch 'master' of https://github.com/tyrbo/the_pivot
updates site design