Merge branch 'master' into WillsBranch
Made User Class Nice and Pretty
Merge branch 'WillsBranch'