Updated Readme file
Fixed conflicts with Readme file, add License file
Merge pull request #16 from taniapinheiro/development

Updated Readme file