models/settings changes
Merging...
Merge branch 'master' of https://github.com/mzhong21/scrapbook
added user model
added user migration