Merge pull request #1 from Vic020/master

init and merge origin
NearTan
NearTan
wendypushthistxt
Merge pull request #2 from NearTan/master

NearTan
Merge pull request #4 from wendylw/master

wendypushthistxt
modify vic