first commit
Merge branch 'master' of https://github.com/xiuzhuo/AngelsStream

* 'master' of https://github.com/xiuzhuo/AngelsStream:
  Initial commit