Updated README.
Merge branch 'master' of github.com:michaelmacinnis/oh

Conflicts:
	README.md