test
Merge branch 'gh-pages' of github.com:pulipulichen/kals into gh-pages

Conflicts:
	index.html
this is my new function!
new pptx
移除PPTX
Merge branch 'gh-pages'

Conflicts:
	index.html