commit 2
Merge remote branch 'upstream/master'

Conflicts:
	CodeBook.md
	run_analysis.R

commit 1
commit 1