Updating .gitignore
Merge branch 'master' into init

Conflicts:
	.gitignore