merge
Merge branch 'master' of https://github.com/dongorigin/WND.git

Conflicts:
	README