untitled deleted
Merge branch 'master' of github.com:audunsh/FYS4411

need to merge files before commit