masonry function hell
attempting to merg - conflict resolution
Merge branch 'master' of https://github.com/martianmartin/myStream