added a dummy test file
Merge pull request #3 from bkng/master

added a test file
made a change to a.txt
changed a.txt
fixed conflict