fixed password encryption, now works
Merge branch 'master' of https://github.com/hbrice/final_project_cis399