Base with postgres and heroku settings
Merge branch 'master' of github.com:KitchnSink/Project-Spatula