Beginning work on the Password Recovery feature
Resolved merge errors
Merge branch 'master' of https://github.com/nmoccia/BootcampCapProject