brance test
AND simple
& simple
merge feature1
add a.txt in feature2
add b.txt in master
Merge branch 'feature2'