Split out User struct
Merge branch 'master' of github.com:bob-p/heroku-teams
add .env / docker