beginning of db integration
fixes conflicts
createUser() functional
Merge branch 'master' of github.com:TheyShouldHaveATeam/TheyShouldHaveThis