updated transactions table
resolved transaction index conflict
Merge pull request #24 from natewinn/nate

updated transactions table
fixed conflicts