third Commit
Merge branch 'master' of https://github.com/ShuangyuanWei/GandCData-CourseProject