Added database_cleaner to gemfile and sper_herlper.rb to spec folder
Added database_cleaner to gemfile and sper_herlper.rb to spec folder
fixed merge conflicts
Merge branch 'master' into user
fixed some merging conflicts
fixed some merge conflicts
Merge pull request #4 from alexcodreanu86/user

User