Gemfile.lock changed
Merge branch 'connor'
Moved the profile into the users controller