git commit
Merge branch 'master' of https://github.com/summit2013/10_16_homework

Conflicts:
	README.md
zuoyechongjiao