Merge pull request #3 from bkng/master

added a test file
made a change to a.txt
changed a.txt
fixed conflict
''
Merge pull request #5 from dcs24/master

Testing
Merge pull request #4 from vkwagner/master

fixed a.txt
Testing my commit and push.