cause pull told me to
fix conflict in .gitignore

Merge branch 'master' of github.com:mhedwards/wine-st599

Conflicts:
	.gitignore