added data
merge conflict fix
Merge pull request #51 from natalie03/master

Fixed merge conflict