Merge pull request #19 from KristaANelson/completing_70%

fixed the damned customerRepoTest
tday weekend changes
fix merge coflicts
Merge pull request #21 from KristaANelson/merge_fix

Merge fix
fixed merge conflicts after turkey day