add file3.txt
add dev_3.txt
Merge branch 'dev_3.0' into dev_2.0
Merge branch 'dev_2.0' into dev_1.0