Refactor, not working though, nullpointerexceptio
Merge branch 'master' of https://github.com/kvillert/Grupp1