Merge branch 'master' into Joseph
set new password
Merge pull request #7 from 210geeks/Joseph

Set up new password