update .gitignore
Merge branch 'master' of https://github.com/scoreur/QS

Conflicts:
	.gitignore