Update .gitignore
Update .gitignore
Merge branch 'master' into row-design

Conflicts:
	.gitignore