Merge pull request #1 from alicoding/gh-pages

aa
Merge pull request #2 from alicoding/master

Merge pull request #1 from alicoding/gh-pages