More changes
Merge branch 'master' of https://github.com/richardandersen/Test

Conflicts:
	README.md

from ws