changed passwordhash to password
Merge branch 'master' of github.com:davidgbe/csci_201_final