testing
Merge branch 'master' of github.com:121watts/the_pivot
merges
heroku shizzle
heroku action
adding assets to heroku
heroku in production
Merge branch 'cart' of github.com:121watts/the_pivot into cart
fixes logo image issue