added git ignore
Merge branch 'master' of https://github.com/nateastle/Trade-Labor

Conflicts:
	.gitignore