add nnew file
change new file
againg change file
againg change file
Revert "againg change file"

This reverts commit be03c2c91ed12d82f369cccc3d9c3e4464053bc4.
create new feature
Change feature
Change develop branch
Merge branch 'feature1' into develop
Revert "Change feature"

This reverts commit 3fed91c743f92fda1b0810ae279b4f7dd965ef7a.
Merge branch 'feature1' into develop
change on develop two file
change 1 on develop two file
change 1 on develop two file
add feature 2
add feature 3
change feature file on develop
merge
change feature 12
Merge branch 'feature2' into develop

Conflicts:
	Medical/testFeature.txt