Merge branch 'master' into gh-pages
:wqMerge branch 'master' of github.com:RobotsConf/2014 into gh-pages
Merge branch 'master' of github.com:RobotsConf/2014 into gh-pages
Updating the highway1 logo