Changed text in tom.txt
Merge branch 'master' of github.com:tablackmore/game

Conflicts:
	tom.txt