added password recovery feature
Merge branch 'master' of github.com:arramos84/cs169-group25