Merge branch 'master' of https://github.com/kornwilliams/GettingAndCleaningDataProject

Conflicts:
	CodeBook.md
Merge branch 'master' of https://github.com/kornwilliams/GettingAndCleaningDataProject