this is my jh project
Merge remote-tracking branch 'origin/master'

Conflicts:
	CodeBook.md
	README.md
	run_analysis.R