index file only commit
testing diff & conflicts
Merge branch 'master' of https://github.com/rratakonda/repository2

Conflicts:
	index.php
Merge http://github.com/rratakonda/repository2

Conflicts:
	index.php