update
Merge branch 'gh-pages' of github.com:cosname/R-conference into gh-pages
fix