Version 2.0
Merge branch 'DuanXu' of https://github.com/doodle777/CourseDesign2014