more modifications
CodeBook.md
fix conflicts

Merge branch 'master' of https://github.com/dsnoob/GetDataCourseProject