dev log modified trying to do tests
removed log file because of merge issue
merging with master