data
updatedmergeconflict
Merge pull request #52 from chinenyem/master

fixed merge conflict. my data