merge conflict resolved
Commit
Added Shadae's bio
Davida Marion bio
added Simon's bio
Bio for Elizabeth Uselton
Updated first draft of Anne's bio.
Update Whitney Bio
Update homework assignments
Merge pull request #22 from Elffers/submissions

Nice work! This is a mergable pull request. Thanks!
Merge pull request #16 from AKimZ/submissions

Thanks! I can merge this - nice job!
Merge pull request #17 from xtina-starr/submissions

Nice job!
Merge pull request #15 from shanghaiellen/submissions

Nice job! Merging.
Sue's Bio
Melinda bio
HHH's bio added
Updated first draft of Anne's bio.
Merge branch 'master' of github.com:Ada-Developers-Academy/daily-curriculum
Adds bio for liz
Added Christina's Bio