Added user.rb
Merge branch 'andy_branch'