remove conflicts 1
add code from commit 81a1dd3
refactor 1
delete conficts in spec_helper
Merge pull request #16 from RubyGarage/feature/user-can-restore-his-password

Feature/user can restore his password