User class added, only code commented out
Merge remote-tracking branch 'origin/master'