index
Merge branch 'gh-pages' of https://github.com/chenjing002/chenjing.github.com into gh-pages

Conflicts:
	.DS_Store
	index.html