Fix all merge conflicts and other errors

- missing semi colon
- missing lines

tomcat/webapps/Trawl/WEB-INF/web.xml

@@ -9,24 +9,6 @@
         <servlet-class>web.Director</servlet-class>
     </servlet>
 
-    <servlet-mapping>
-        <servlet-name>Trawl</servlet-name>
-        <url-pattern>/doBioLookup.do</url-pattern>
-        <url-pattern>/doHist.do</url-pattern>
-        <url-pattern>/doMap.do</url-pattern>
-    </servlet-mapping>
-=======
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
-    <servlet>
-        <servlet-name>Trawl</servlet-name>
-        <servlet-class>web.Director</servlet-class>
-    </servlet>
-
     <servlet-mapping>
         <servlet-name>Trawl</servlet-name>
         <url-pattern>/doBioLookup.do</url-pattern>

tomcat/webapps/Trawl/infoWindow.js

@@ -5,14 +5,7 @@
 // When the user clicks the marker, an info window opens
 var openWindow;
 
-<<<<<<< HEAD
 function initInfo(lati, longi,name, date, individualCount) {
-=======
-
-
-function initInfo(lati, longi,name, date, count ) {
-	console.log("Trying to gen. info map");
->>>>>>> origin/web
     // Generate map centred at Great Lakes
     var map = new google.maps.Map(document.getElementById('map'), {
         zoom: 5.5,

tomcat/webapps/Trawl/script.js

 // Initialization
 function init() {
+    console.log("trying to init");
     callUpdateSci({id:"pickAnimalia", value:2});    // Propagate Dropdowns on Startup
     reqHistogram(2);
 }
@@ -280,3 +281,4 @@ $( function() {
     $( "#fromtoYear" ).html($( "#slider-range" ).slider( "values", 0 ) + " - " + $( "#slider-range" ).slider( "values", 1 ))
 } );
 
+window.onload = init;
\ No newline at end of file