Made a test change to the testing branch
This commit is to test the divergence
Merge branch 'testing'

Conflicts:
	README.txt
testing changes
testing changes
testing2 changes
Merge branch 'testing'