Copied schema and user.rb files from master branch after running a git pull from the upstream in that branch. Pasted those files over their sibling files in the create_controllers4 branch to ammend merge conflicts.
Merge branch 'create_controllers4' of github.com:CollinBlinder/pixelect-api into create_controllers4