setting up gitignores to allow development inside magento.
setting up gitignores to allow development inside magento.
Merge branch 'master' into 8.15

Conflicts:
	.gitignore