Adding Feature Foobar

This feature does x, y, and z
Merge branch 'feature/foobar' into develop

Conflicts:
	my-cool-plugin.php