Update Stian-assign6

updated assignment 6
Merge pull request #232 from serang/patch-14

Update Stian-assign6