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

Conflicts:
	.gitignore