feature 123 test
master 123
fixed bug 123
Merge branch 'bug1' into feature1