Fixed variable name conflict in adcp_functions
Merge pull request #20 from cwingard/adcp

ADCP Functions: variable naming conflict