User Stuff

Gave the User class two constructors; one for new users, one for
existing users.
Merge branch 'Huys_Branch'
Merge branch 'master' into Huys_Branch
trying to overhaul from checkbox to expandable list for future use