Added feature1
Added feature 1
Added new feature2
Added additional features to feature2
Merged feature2_additional into master
Added feature2
Added file2.txt