trying to get our migrations on heroku
merge conflicts
Merge branch 'master' of github.com:sufrin-kim-fishman/node_express_sample_app