More changes to silly.txt
Merge branch 'scott'sWorkingBranch'

Conflicts:
	silly.txt