updating master branch with latest changes
Merge pull request #12 from phoebebscott/marysbranch

updating master branch with latest changes