update
Merge branch 'master' of https://github.com/aterhorst/getting-and-cleaning-data

Conflicts:
	README.md
update