Merge branch 'master' of git.njae.me.uk:advent-of-code-16
authorNeil Smith <neil.git@njae.me.uk>
Wed, 21 Dec 2016 15:41:11 +0000 (15:41 +0000)
committerNeil Smith <neil.git@njae.me.uk>
Wed, 21 Dec 2016 15:41:11 +0000 (15:41 +0000)

Trivial merge