Adding the logging directory to gitignore
Merge branch 'master' into dev