version 1.2
Merge https://github.com/emiliocy/GettingAndCleaningData

Conflicts:
	tidy.txt