changes to gitignore
Merge branch 'master' of github.com:Holderness/Canadian-Tuxedo

Conflicts:
	.gitignore