9: trying for serving static on heroku
38: merged conflict
38: added psycopg2 for Postgres on Heroku