devleoper change
Merge branch 'master' of https://github.com/pranaykamat/TestGit

Conflicts:
	Simple2.txt