Adding Role
Merge branch 'master' of https://github.com/Grahamcr/CS6440-team13.git
Adding User Roles, fixing null pointer error on login