Merge branch 'neil' of git.njae.me.uk:national-cipher-challenge into neil