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

Conflicts:
	Getting and Cleaning Data W3 Quiz.R
Week 3 Quiz

trying a sync with GitHub