touched newfile to resolve issue 54
changed something in newfile
Merge branch 'issue54'
conflictfile added
added conflictfile on master too
merged and resolved conflicts
deleted unnecessary files
new file on test branch
Update newfile
Update newfile and add some message
Merge remote-tracking branch 'github/master'
touched a
touched b and c