annie's first edits
Merge pull request #2 from avang/master

Annie's edition
second try from annie
yo
more ddd
Merge branch 'release-1' of ssh://github.com/avang/ForkingPractice into release-1