Menu fixing

Removed the <<<<<<< HEAD... etc from the middle of FindTheTime.jsp. Some
formatting in web.xml updated.