Update Stian-assign4

updated assignment 4
Merge pull request #231 from serang/patch-13

Update Stian-assign4