Added User class; usernames, position, etc
Merge remote-tracking branch 'origin/master'