initial work
Merge branch 'master' of github.com:jhsx/wx

Conflicts:
	.gitignore