1
Merge branch 'gh-pages' of https://github.com/WC2014/playforfun.wc2014 into gh-pages

Conflicts:
	results.html