Set up User and Account models
Merge remote-tracking branch 'origin/master'