Added Feature1
Added Feature2
Added additional features to feature 2
Merged feature 2 with master
Added Feature3
FixedBug#12354
Really fixed the bug
merged file1.txt
done with cherrypickA