adding myfeature_file.txt
new feature implementation
feature2 first commit
added a line to myfile.txt for feature2
Merge branch 'myfeature'