Commit to bring repo up to date.
Fixed merge conflict in schema.rb.
updated users controller on the wrong fork.