Add a item in PLAN by huoying
Add one more item by huoying
Merge branch 'master' of github.com:huoying/testing into huoying-master

Conflicts:
	PLAN