Merge pull request #4 from Mrshcom/back2mywork

update my work
Fix TXT
Fucking smartgit confilict solver!!!
a..hole
Merge pull request #4 from AliGH/back2mywork

Merge pull request #4 from Mrshcom/back2mywork