README update
Merge branch 'master' of github.com:toddhainsworth/w

Conflicts:
	README.md