separated client- and server-code
Merge branch 'master' of https://github.com/aleksanw/Systemutvikling-fellesprosjekt