in the middle of pw stuff
Merge branch 'master' of https://github.com/stevekane/videosite
password change works!
Merge branch 'master' of https://github.com/stevekane/videosite