update from feature3
update-2 from feature3
feature 4 changes

Files 6 added
Updated so and so functionality in File2
Merge pull request #1 from ravitejagarlapati/feature4

feature 4 changes
update two file

change in file1 and created new file5
Merge remote-tracking branch 'origin/feature/feature3'

Conflicts:
	File2
Merge pull request #3 from ravitejagarlapati/feature2

update two file created new file and change is done on only file please take update it
Merge branch 'master' into feature1

Conflicts:
	File1
	File6