2
Merge branch 'master' of https://github.com/ponsakthi/demo

Conflicts:
	sample.txt