Transport being added to galv simulations

Altering the galv_b and galv_f projects in order to run drifter transport calculation.
fixing merge problem