Merge branch 'staging' into dev_security
Added a space

Don’t know why it’s making me commit this
.gitignore

added back to the gitignore file
Merge branch 'dev_security' into staging

Conflicts:
	.gitignore