update to r
Merge pull request #250 from katiewood/master

update to r