Added feature 1
Added feature2
Added additional features to feature2
Merged feature2 into master
Added feature 3 code
Fixed bug#1234
Finally fixing Bug1234. For the last time.
Added fixes to file1.txt
Added fix2
Fixed issue with cherry picking file1.txt file
fix merge issues with file2.txt