working version
july24
Merge pull request #1 from sarahvdl/may

july