updating third file
Merge branch 'master' into feature1

Conflicts:
	thirdFile
Merge pull request #1 from maheshp9/feature1

Feature1