Fullfilled all TODOs and refactored User class
Merge pull request #1 from Earlvik/master

Fullfilled all TODOs and refactored User class