new file:   .gitignore
Merge branch 'master' into new-feature
	modified:   .gitignore
Merge branch 'master' into new-feature