Added feature1
Fixed Bug#1234
added feature2
Really fixing the bug
additonal changes
merged feature1 changes
Merged bug1234