Merge branch forgotpassword into master
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	db/schema.rb