edit slide 2014-04-22
recommit 2014-04-22
Merge branch 'master' into gh-pages
edit slide 2
Merge branch 'master' into gh-pages