messing with log file
Merge branch 'development' into qa
Merge branch 'development' into qa
Merge branch 'qa' into production
adding logging
Merge branch 'production' into qa