add feature1
add feture2
add additional feature to feature2
merged feature2 additional to master
add feature3
fixed bug 1234
another fix bug 1234
add fix2
add fix2