Added feature1
Added feature2
Merged feature2_additonal into master
Added feature3
Realling fixing Bug#1234
Added fix1
Added fix2
Applying fix1 change
Adding changes