merge
Merge branch 'master' of github.com:audunsh/FYS4411
commit. checking for updates