Merge branch 'writeup'
authorNeil Smith <neil.github@njae.me.uk>
Wed, 24 Apr 2013 12:47:51 +0000 (13:47 +0100)
committerNeil Smith <neil.github@njae.me.uk>
Wed, 24 Apr 2013 12:47:51 +0000 (13:47 +0100)
Conflicts:
README.md


Trivial merge