Merge branch 'gh-pages' of https://github.com/mmagicbox/home into gh-pages

Conflicts:
	.gitignore
	README.md

Signed-off-by: mmagicbox <mmagicbox@163.com>
Merge branch 'gh-pages' of https://github.com/mmagicbox/home into gh-pages