Merging
Merge branch 'master' of https://github.com/ErlendLS/TFE4850
Added timestamp to log files