added user constructor and password
Merge branch 'master' of https://github.com/tdegenko/CSC296Final