first commit
Merge branch 'master' of github.com:AlexsJones/TD

Conflicts:
	.gitignore