en py-fil for klient og en for server
Merge branch 'master' of git://github.com/vekka/inf-2301