Cat name now included.
Merge branch 'master' of https://github.com/jargon-tech/testing

Conflicts:
	temp.bin