Back to what I know works.
Merge branch 'master' of https://github.com/fayecoga/GettingAndCleaningDataProject

Conflicts:
	run_analysis.R