dev_1.0 commit to sample
fixed conflict, no changes from issue01
dev_1.0 change1
dev_1.0 change2
Merge branch 'dev_1.0' of https://github.com/charmgranada/tc into issue01

Conflicts:
	sample.rtf