switched to heroku db
Merge branch 'master' of https://github.com/timsants/CS147-Project
fixed submit button for new user
fixed conflicts