Modify team.txt  (Edwin)
Modify team.txt (EdwinLi)
Merge branch 'develop' of github.com:tythia13/Helloworld into develop