WINDOWS!!!
Merge branch 'master' of https://github.com/ErlendLS/TFE4850
small changes
Merge branch 'master' of https://github.com/ErlendLS/TFE4850