wrap it up
Merge branch 'gh-pages' of github.com:jsconf/2014.jsconf.eu into gh-pages