add linux con 2014 slides
Merge branch 'master' of github.com:ouyanggh/guohua