initializing......
马群的前端代码
增加testCtrl 更新马群的修改
Merge branch 'master' of github.com:mmqq834533/hangUpGame

# By Edel
# Via Edel
* 'master' of github.com:mmqq834533/hangUpGame:
  Initial commit