some texts
Merge branch 'master' of github.com:qingguang/MasterThesis
some texts