Merge pull request #1 from pierriko/gh-pages

ROSCon13 changes