index 1
Merge github.com:talapaneni/Git.demo.tort

Conflicts:
	index.txt
merge conflicts resoved