started transaction ids
Merge branch 'master' of git@github.com:dshawmemaybe/420blazeyoloswag
Merge branch 'master' of git@github.com:dshawmemaybe/420blazeyoloswag
changed transactions to integer
fixed merge conflicts