Add gitignore
Merge branch 'TBranch' into beta