Merge branch 'master' of https://github.com/herokingsley/Emba
Merge branch 'master' of https://github.com/herokingsley/Emba

Conflicts:
	.DS_Store

Signed-off-by: yaodd <yaodunding2006@163.com>