add testword
Merge branch 'master' of https://github.com/weiiboy/pj_group_1
delete testword