adding more database stuff
Merge branch 'login'