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

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

Conflicts:
	critical-mass/index.html