Merge branch 'gh-pages' of github.com:easoncxz/tifa into gh-pages

Conflicts:
	README.md
Merge branch 'gh-pages' of github.com:easoncxz/tifa into gh-pages

Conflicts:
	README.md