Merge branch 'master' of https://github.com/LesEvans/Get-and-Clean-Data

Conflicts:
run_analysis.html