tday weekend changes
fix merge coflicts
Merge pull request #21 from KristaANelson/merge_fix

Merge fix