no message
Merge branch 'master' of https://github.com/eugeneyan/Getting-and-Cleaning-Data

Conflicts:
	Getting and Cleaning Data/.Rhistory