Try merge.
Merge branch 'master' of https://github.com/wqfish/Niahug

Conflicts:
	README