chap-5 complete
Merge branch 'MsThesis' of https://github.com/iamyf/MsThesis into MsThesis