From: Neil Smith <neil.git@njae.me.uk>
Date: Sun, 27 Mar 2016 12:35:08 +0000 (+0100)
Subject: Merge conflict resolved
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=346ad6e81b0a018e2164ba407412cf2045c55ef0;p=cipher-training.git

Merge conflict resolved
---

346ad6e81b0a018e2164ba407412cf2045c55ef0