putting things together
Merge branch 'master' of https://github.com/raymondjacobson/bubblio