index.html 布丁
Merge branch 'gh-pages' of github.com:pulipulichen/kals into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of github.com:pulipulichen/kals into gh-pages

Conflicts:
	index.html