Change of README
Change on Change
Test commit with merge problem.  Should fail.
A change with conflict?
Merge branch 'master' of https://github.com/RishiGames/Testing

Conflicts:
	README.txt