Added feature2
Added feature3
added
Merged feature3 into master
Added feature4
Fixed bug#1234
Really fixing Bug#1234
modified file1.txt
modified file1.txt