added a_file2.txt
added a_file3.txt
Merge branch 'master' into my-topic