modified README.md
Merge branch 'master' of github.com:mosuke5/oolong

Conflicts:
	README.md