Added feature1
added log.txt
Added additonal feature to feature2
resove conflick
added file1.txt