Update c.txt

updated on origin/master
Merge branch 'wip/bradtm2000/test'

Conflicts:
	c.txt