fix merge
Merge branch 'transactions' of github.com:jayme-github/cryptex into transactions