Changes 1 to README
Master branch v1
testing branch v2
Merge branch 'testing'

Conflicts:
	README.md
restored master