'testfilene for lab3'
Merge branch 'master' of github.com:evenhoyer/IS105