Rspec
Add Test - User
Merge origin/master