Fix merge conflict

index.html

@@ -33,35 +33,10 @@
 					<p>Developers these days are spoiled with choice when it comes to selecting an <strong>MV* framework</strong> for structuring and organizing JavaScript web apps. Backbone, Spine, Ember (SproutCore 2.0), JavaScriptMVC... The list of new and stable solutions goes on and on, but just how do you <strong>decide</strong> on which to use in a sea of so many options?.</p>
 					<p>To help solve this problem, we created <a href="http://github.com/addyosmani/todomvc">TodoMVC</a> - a project which offers the same Todo application implemented using MV* concepts in most of the popular JavaScript MV* frameworks of today.</p>
 					<p>Solutions look and feel the same, have a common simple feature-set and make it <strong>easy</strong> for you to compare the syntax and structure of different frameworks so you can select the one you feel the most comfortable with.</p>
-
 				</div>
 				<div class="span5" id="demos">
 					<h2>Demos</h2>
 					<ul class="nav nav-pills">
-<<<<<<< HEAD
-						<li><a href="architecture-examples/backbone/index.html">Backbone.js</a></li>
-						<li><a href="dependency-examples/backbone_require/index.html">Backbone.js + RequireJS</a></li>
-						<li><a href="architecture-examples/emberjs/index.html">Ember.js</a></li>
-						<li><a href="architecture-examples/javascriptmvc/todo/todo/index.html">JavaScriptMVC</a></li>
-						<li><a href="architecture-examples/spine/index.html">Spine.js</a></li>
-						<li><a href="architecture-examples/knockoutjs/index.html">KnockoutJS (MVVM)</a></li>
-						<li><a href="architecture-examples/sammyjs/index.html">Sammy.js</a></li>
-					</ul>
-					<ul class="nav nav-pills">
-						<li><a href="architecture-examples/dojo/index.html">Dojo</a></li>
-						<li><a href="architecture-examples/closure/index.html">Closure</a></li>
-						<li><a href="architecture-examples/yuilibrary/index.html">YUILibrary</a></li>
-						<li><a href="architecture-examples/knockback/index.html">Knockback.js</a></li>
-						<li><a href="architecture-examples/angularjs/index.html">AngularJS</a></li>
-						<li><a href="architecture-examples/angularjs_persistencejs/index.html">Angular + PersistenceJS</a></li>
-					</ul>
-					<ul class="nav nav-pills">
-						<li><a href="architecture-examples/extjs/index.html">Ext.js</a></li>
-						<li><a href="architecture-examples/broke/index.html">Broke.js</a></li>
-						<li><a href="architecture-examples/fidel/index.html">Fidel.js</a></li>
-						<li><a href="architecture-examples/jquery/index.html">jQuery</a></li>
-						<li><a href="reference-examples/vanillajs/index.html">Vanilla JS</a></li>
-=======
 						<li>
 							<a href="architecture-examples/backbone/index.html" data-source="http://documentcloud.github.com/backbone/" data-content="Backbone.js gives structure to web applications by providing models with key-value binding and custom events, collections with a rich API of enumerable functions, views with declarative event handling, and connects it all to your existing API over a RESTful JSON interface.">Backbone.js</a>
 						</li>
@@ -117,7 +92,6 @@ had it been designed for web apps">AngularJS</a>
 						</li>
 						<li><a href="architecture-examples/jquery/index.html" data-source="http://jquery.com/" data-content="jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.">jQuery</a></li>
 						<li><a href="reference-examples/vanillajs/index.html" data-source="https://developer.mozilla.org/en/JavaScript" data-content="You know JavaScript right? :P">Vanilla JS</a></li>
->>>>>>> Add popover with framework description and link to website
 					</ul>
 				</div>
 				<div class="span3">