model user with attributes
bootstrap created
conflict in schema resolved
pulling master branch
schema changed