Gitignore
Merge branch 'master' into Block-Registry---New

Conflicts:
	.gitignore