initial commit tx branch
added gitignore
Merge branch 'tx'