This is the merge data code from Chris.  I am trying to commit it from RStudio.  -Talia
Talia is still learning how to use this thing called github.

Merge branch 'master' of https://github.com/kaycole/fish_shift

Conflicts:
	emma_try