添加gitignore配置
Merge branch 'master' of github.com:zhoulei-github/wx

Conflicts:
	.settings/org.eclipse.core.resources.prefs