hw3

first
Merge pull request #3 from lijj47/master

hw3-ljj
目录更正

+ljj
Merge pull request #8 from wangxuecan/master

group6