Half-done with part2
Merge branch 'master' of github.com:nox27/script_oblig4