rspec tests for user
update database.yml
Merge branch 'temp'