合并谢宏宇作业
Merge branch 'master' of github-oscu:oscu/OpenSource-13-06
Updated the names.md
Merge branch 'master' of github-oscu:oscu/OpenSource-13-06

Conflicts:
	slides/names.md