merge data
clean data
Merge pull request #11 from alisha791/master

merge data