tc_1.0 edit
tc1 - edit
new branch
Merge branch 'tc_1.0' of https://github.com/charmgranada/test

Conflicts:
	trialFile.rtf