stupid git making me commit one dumb change
git is being stupid.

Merge branch 'master' of https://github.com/erichare/extensive-assignments

Conflicts:
	ext1/Grant_Hare_Tyner_ExtensiveAssn1.Rnw