gitignore update
Merge branch 'master' of github.com:ktryber/quick2290

Conflicts:
	.gitignore