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

Annie's edition