Added fox line.
Merge branch 'master' of https://github.com/asimo42/TestRepo

Conflicts:
	stuff.txt