Added additional attributes to users model, reworked model to be more efficient and more readable.
Merge branch 'master' of github.com:cit-jmu/workshop