Merge branch 'gh-pages'
Adding Bradys talk
Merge branch 'master' of github.com:RobotsConf/2014
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:RobotsConf/2014 into gh-pages