initial amend
Merge branch 'master' of https://github.com/akorp/Oblig4