resolve merge conflict

js/components/ascribe_app.js

@@ -6,7 +6,7 @@ let Link = Router.Link;
 let RouteHandler = Router.RouteHandler;
 
 
-class AscribeApp extends React.Component {
+let AscribeApp = React.createClass({
     render() {
         return (
             <div>
@@ -18,6 +18,6 @@ class AscribeApp extends React.Component {
             </div> 
         );
     }
-};
+});
 
 export default AscribeApp;

js/components/table.js

@@ -30,4 +30,4 @@ let Table = React.createClass({
     }
 });
 
-export default Table;
+export default Table;