deleted Ostrich folder, trying to fix submodule problem.
Added Ostrich back in.
Trying to resolve the Ostrich submodule problem. Deleted the folder, committed the delete, pulled, merged, pushing.