user table dropped sorcery gem to be added
user_id now standing in for creator_id as foreign key
merging models fix for users

cation'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.