updates
Merge branch 'master' of https://github.com/wilcoxa/Gettingandcleaningdata

Conflicts:
	codebook.md