Update README.md
Merge branch 'master' of github.com:buren/test into whattahw

Conflicts:
	README.md