Fixed merge errors

index.php

@@ -824,6 +824,7 @@ $tree = get_tree("docs");
 	<link href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,700,300,100' rel='stylesheet' type='text/css'>
 	<link rel="stylesheet" href="/css/daux-blue.css">
 	
+
 	<!-- hightlight.js -->
 	<script src="http://yandex.st/highlightjs/7.3/highlight.min.js"></script>
 	<script>hljs.initHighlightingOnLoad();</script>
@@ -837,6 +838,9 @@ $tree = get_tree("docs");
 				$(this).parent().siblings().find('ul').slideUp();
 				$(this).next().slideToggle();
 			});
+
+			// Bootstrap Table Class
+			$('table').addClass('table');
 		});
 	</script>
 </head>
@@ -885,8 +889,6 @@ $tree = get_tree("docs");
 							<? } ?>
 						</div>
 					<? } ?>
-
-					
 				</div>
 			</div>
 			<div class="right-column float-view content-area span9">