new file:   .gitignore
Merge branch 'origin/release-2.1'

Conflicts:
	.gitignore