Updated text
Fixed merge conflict
Merge pull request #3 from kr-project/test-branch

Updated text