update
Merge github.com:tanghaodong25/jikyll into gh-pages
update