added iteration 4
Merge branch 'master' of https://github.com/magnusjerre/Kundestyrt_Prosjekt