added xxx.txt
changed .gitignore
removed text.txt and modified gitignore
Merge branch 'cleanup'