Merge pull request #19 from kristenmills/master

Hurr durr durr Live updates
Merge pull request #20 from kristenmills/master

Unbroked