Added pet of the month
Added barebones of reset password
Fixed merge conflicts
Working password confirmation
Cucumber Green Again
updated rspec