Merge branch 'presentation-slides' of github.com:NeilNjae/cipher-training into presen...
authorNeil Smith <neil.git@njae.me.uk>
Wed, 2 Jul 2014 21:15:16 +0000 (22:15 +0100)
committerNeil Smith <neil.git@njae.me.uk>
Wed, 2 Jul 2014 21:15:16 +0000 (22:15 +0100)

Trivial merge