files for homework
Merge remote-tracking branch 'origin/master'

Conflicts:
	run_analysis.R