allen
Merge branch 'master' of https://github.com/HenryYang/WECO

Conflicts:
	we.txt