master branch change
added issue53 txt file
Fixed hotfix
Fixed issue 53
Merge branch 'iss53'
created a merge issue
creating a merge conflict
fixed the merge conflict