halfway through
Merge branch 'master' into reset-password
finish password reset
Merge pull request #54 from davidtlee/reset-password

Reset password