fixed routing
Merge branch 'gh-pages' of github.com:conference-schedule/phpunconf2014 into gh-pages