changed a.txt
fixed conflict
Merge pull request #4 from vkwagner/master

fixed a.txt