UI
Merge branch 'master' of https://github.com/karigeir/Skil3
UI breytingar