fixed indentation errors
Merge branch 'master' of https://github.com/eswalker/cos333

Merge with Ed
Merge branch 'master' of https://github.com/eswalker/cos333

Merge with Ed
heroku commit
trying heroku
moved requirements
added psycopg2 to requirements
heroku with sqlite
heroku one more time
moved Procfile
moved around wsgi
moved procfile
modified procfile
resyned db
different db
database addon
potentially fixed database
Merge branch 'master' of https://github.com/eswalker/cos333

Merge heroku with Ed's changes
created alternate prod.py for production settings