Merge branch 'master', remote-tracking branch 'origin'
added logging files
merged
Merge branch 'master', remote-tracking branch 'origin'