readme
Merge branch 'master' of https://github.com/michaelbontyes/w

Conflicts:
	README.md