Code logging disabled etc.
Merge branch 'master' of https://github.com/IN4391/IN4391-1