added .txt to git ignore list
Merge branch 'master' into old_res