test commit
fixed

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

Conflicts:
	run_analysis.R