Merge pull request #66 from dchote/master

Site content updates

Author: quartzjer

index.html

@@ -17,7 +17,8 @@
 <nav>
 <ul>
 <li><a href="https://github.com/telehash/telehash.org/blob/master/implementations.md">Implementations</a></li>
-<li><a href="https://github.com/telehash/telehash.org/blob/master/protocol.md">Protocol</a></li>
+<li><a href="https://github.com/telehash/telehash.org/blob/master/protocol.md">Legacy Protocol</a></li>
+<li><a href="https://github.com/telehash/telehash.org/blob/master/E3X.md">E3X Protocol</a></li>
 <li><a href="https://github.com/telehash">GitHub</a></li>
 <li><a href="http://twitter.com/search?q=telehash">News</a></li>
 </ul>
@@ -43,14 +44,20 @@ <h3>What</h3>
 	<p>It works by having every application generate its own unique public-key based address (hashname) that can send and receive small encrypted packets of <a href="http://www.json.org/">JSON</a> (with optional binary payloads), and provides an automatic routing system based on <a href="http://en.wikipedia.org/wiki/Kademlia">Kademlia</a>, a proven and popular <a href="http://en.wikipedia.org/wiki/Distributed_hash_table">Distributed Hash Table</a>.  
 </div>
 <div class="span-8">
+<h3>Rival Messenger</h3>
+<p>
+<a href="http://www.rivalmessenger.com">Rival Messenger</a> is an instant messaging application for OSX 10.9 and above. It is built on top of the <a href="https://github.com/telehash/objc">Objective-C</a> library, and has been built from the ground up to work exclusively on top of Telehash to provide a proof of concept for the network.	
+</p>
+
 <h3>Demo</h3>
 <p>It's very much in the R&amp;D stages yet, but check out the <a href="https://github.com/quartzjer/fieldtest">field-test utility</a> for a simple demo, or try one of the <a href="https://github.com/telehash/telehash.org/blob/master/implementations.md">libraries</a>.
 </p>
 </div>
 <div class="span-8 last">
 <h3>Status</h3>
+<p>We are hard at work defining the next generation of Telehash, the <a href="https://github.com/telehash/telehash.org/blob/master/E3X.md">E3X spec</a> is currently being defined, and is open for feedback <a href="https://github.com/telehash/telehash.org/issues/57">here.</a>
 <p>
-The current <a href="https://github.com/telehash/telehash.org/blob/master/protocol.md">spec</a> is implemented in a <a href="https://github.com/telehash/telehash.org/blob/master/implementations.md">few languages</a> (any help here would be great!) and prototype apps are being created to test it.  Questions can be directed at <a href="http://twitter.com/jeremie">twitter</a>, or to <a href="xmpp:jer@jabber.org">Jeremie Miller</a> directly.
+The legacy <a href="https://github.com/telehash/telehash.org/blob/master/protocol.md">spec</a> is implemented in a <a href="https://github.com/telehash/telehash.org/blob/master/implementations.md">few languages</a> (any help here would be great!) and prototype apps are being created to test it.  Questions can be directed at <a href="http://twitter.com/jeremie">twitter</a>, or to <a href="xmpp:jer@jabber.org">Jeremie Miller</a> directly.
 </p>
 </div>
 </div>