Merge remote-tracking branch 'origin/Tom'

Conflicts:
	.gitignore
;
i remove the Tom.h file
i added the Tom.h file