Removed log file from commit
Merging in removal of log file
Merge remote-tracking branch 'upstream/master'