week 3 code by linjingjian
Merge branch 'master' of https://github.com/coderfengyun/TCSE2012

Conflicts:
	.gitignore