Added a.txt
Updated to a.txt
Merge branch 'dev'