From: Matt Corallo <github@bluematt.me>
Date: Mon, 24 Aug 2015 01:31:58 +0000 (-0700)
Subject: Merge pull request #12 from apoelstra/patch-2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=bitcoinninja;a=commitdiff_plain;h=d0a96c4ce336d83773543b1ad8bb70c1dc5656af;hp=9f98f307b31f3237872a7c92fa72e9804e6c4d6e

Merge pull request #12 from apoelstra/patch-2

Add link to gmax's hardfork wishlist
---

diff --git a/index.html b/index.html
index 201347b..a7a25bb 100644
--- a/index.html
+++ b/index.html
@@ -47,6 +47,7 @@ Implementations of cool things:
 <li><a href="https://github.com/zw/PoLtree/">proving Bitcoin liabilities, in Clojure.</a> or <a href="https://github.com/olalonde/proof-of-liabilities">Proof of Liabilities, in JavaScript</a></li>
 <li><a href="https://github.com/petertodd/timelock">Create a secret key that can be decrypted in a known amount of time using parallel-serial hash chains.</a></li>
 <li><a href="https://github.com/Blockstream/contracthashtool">Pay to Contract Hash calculator</a></li>
+<li><a href="https://github.com/vinumeris/lighthouse/blob/master/docs/Design%20doc.md">Lighthouse - simple SIGHASH_ANYONECANPAY multi-party payments</a></li>
 </ul>
 
 Edit this page at <a href="https://github.com/TheBlueMatt/bitcoinninja">https://github.com/TheBlueMatt/bitcoinninja</a>