confilict resolution
Merge branch 'master' of https://github.com/martianmartin/myStream