refactor
Merge branch 'master' of https://github.com/jjzhou/jjzhou.github.com

Conflicts:
	index.html
refactor