Merge branch 'master' of https://github.com/mmagicbox/mmagicbox.github.com

Conflicts:
	README.md

Signed-off-by: mmagicbox <mmagicbox@163.com>
Merge branch 'master' of https://github.com/mmagicbox/mmagicbox.github.com