index required
Merge branch 'master' of https://github.com/lingjun/lingjun.github.com

Conflicts:
	index.html