Added user model, based on the tutorial
Merge remote-tracking branch 'origin/master'