modify file
Merge branch 'gh-pages' of github.com:peter35/yuli into gh-pages

Conflicts:
	index.html