Readme update
Merge branch 'master' of github.com:mish-mash-style/mishmash

Conflicts:
	README.md