konflikt
Merge branch 'master' of ssh://github.com/Cadynum/kandidat
dåliga filer