made a change
master changes
hotfix change
Merge branch 'testing'

Conflicts:
	README
tweak README