update
Merge branch 'master' of https://github.com/banjamine/datasciencecoursera

Conflicts:
	codebook.txt