modified readme to create a conflict
Merge pull request #3 from juandefelix/third_branch

modified readme to create a conflict