Added new intro and conclusion slides
Merge branch 'gh-pages' of https://github.com/hpcarcher/2014-12-03-edinburgh into gh-pages