1.use template
Merge branch 'master' of https://github.com/teze/teze.github.io

Conflicts:
	index.html