modify
modify Merge branch 'master' of https://github.com/lukachun/lukachun.github.com

Conflicts:
	index.md