switch to master
Add feature 1
Merge branch 'develop' into Feature1
merge
add new file
Merge branch 'Feature2'
add bred
Merge branch 'Feature2'
new feature add