1
Merge branch 'gh-pages' of https://github.com/miaojiha/template into gh-pages

Conflicts:
	formal.html