making conflict change in nom nom readme
Merge branch 'master' of https://github.com/gwongz/nom-nom

Conflicts:
	README.md