Password hash encryption working
Merge branch 'dev' of github.com:austinheimark/SoCollege into dev