Merge branch 'gh-pages' of https://github.com/coranos/critical-mass.git
into gh-pages
Merge branch 'gh-pages' of https://github.com/coranos/critical-mass.git into gh-pages