changed transactions to have edit etc etc
non-working search
a
conflict resolution
Merge pull request #31 from natewinn/sid

Sid