more updates
Merge branch 'master' of github.com:gadicohen/wmd

Conflicts:
	README.md