modified gitignore
Merge branch 'jonathan12101986-staging' into staging

Conflicts:
	.gitignore