Talking about issue 54
Fixed some bug.
touched newfile to resolve issue 54
changed something in newfile
Merge branch 'issue54'
conflictfile added
added conflictfile on master too
merged and resolved conflicts