Giving up on trying to get subdir in heroku to work, just moving to root
Merge branch 'master' into modeling-users
Fixing merge problem
Adding user validation + test
Adding index to db schema