Merge branch 'master' of github.com:frontrend/frontrend.github.io

* 'master' of github.com:frontrend/frontrend.github.io:
  Modified slide link
  Added 1018 frontrend kanazawa report
FRConf Teaser
Merge branch 'conference'

* conference:
  FRConf Teaser