add good morning
add 2.txt
Merge branch 'version1.0'