add feature 1 file
feaute 1 line 1
feature 1 line 2
Merge branch 'feature1'
add file 2