Merge branch 'master' of https://github.com/dave68/Getting-and-Cleaning-Data-Course-Project

Conflicts:
	run_analysis.R
Merge branch 'master' of https://github.com/dave68/Getting-and-Cleaning-Data-Course-Project