updatend zconf2014
Merge branch 'gh-pages' of github.com:jadijadi/presentations into gh-pages