finished some transactions, merchant code
fixed merge conflicts after turkey day
Merge pull request #23 from KristaANelson/completing_70%

Completing 70%