Update .gitignore
Merge branch 'Bambrick'

Conflicts:
	.gitignore
Merge branch 'master' into Bambrick