first commit
Merge branch 'master' of https://github.com/wangjia55/lesson_1