pushing major changes to heroku
working on stripe
fixed merge conflicts, working on stripe