fixed rogue merge additions
updating merge

Merge branch 'master' of https://github.com/carolineartz/sharing-is-caring