gitignore
Merge branch 'master' of github.com:Killen1/mtw

Conflicts:
	.gitignore