ADded a bunch of stuff
Merge branch 'master' of github.com:norwoodj/Forget-Your-Password