Added feature1
Added feature2
Adding line to Feature1
Added additional feature to feature2
Merged feature2_additional into master
Added feature3 to this file