OMerge branch 'development' of git.njae.me.uk:cipher-training into development
authorNeil Smith <neil.git@njae.me.uk>
Fri, 21 Oct 2016 12:33:59 +0000 (13:33 +0100)
committerNeil Smith <neil.git@njae.me.uk>
Fri, 21 Oct 2016 12:33:59 +0000 (13:33 +0100)

Trivial merge