resolve conflicts
Merge pull request #29 from lcxfs1991/gh-pages

resolve conflicts