Update .gitignore
Merge remote-tracking branch 'origin/master' into newfeature

Conflicts:
	.gitignore