adding file5 to adding_file2 branch
adding file6 to master branch
Merge branch 'adding_file2'
update after longwencan forking