testing updates
new testing updates
Merge branch 'newfeature'

Conflicts:
	readme.txt