testing 1st commit
Merge branch 'testing' yes

Conflicts:
	readme.txt