Git commit changes
Merge branch 'newfeature'

Conflicts:
	readme.txt
Merge branch 'master' of github.com:rajeshganjir/general-repository-demo

Conflicts:
	readme.txt
testing conflicts