added users-set to the server(currently no function)
Merge branch 'master' of github.com:aleksanb/fellesprosjektet