add three files: file1 file2 file3
add new file: wy.erl
add new file: wy.c
Merge branch 'new_branch'