någerlunda klart gui till main
Merge branch 'master' of https://github.com/AndreasArne/DV1431