issue1 edit
Merge branch 'issue-1' of https://github.com/charmgranada/test

Conflicts:
	trialFile.rtf