Added a user class that is to resolve input
Merge branch 'master' of https://github.com/Kuxe/oopprojekt
Merge branch 'master' of https://github.com/Kuxe/oopprojekt
fixed a merge conflict in controller