Merge pull request #30 from pbalm/add-suborg-timelab

Adding Timelab contact info as one of the sub-orgs.

Author: terriko

index.html

@@ -646,7 +646,7 @@ <h2>Project Ideas</h2>
 <tr>
     <!-- Logo -->
     <td rowspan="4" class="logo">
-        <img src="http://pypy.org/image/pypy-logo2-white-background.png" 
+        <img src="http://pypy.org/image/pypy-logo2-white-background.png"
              width="300px"></td>
     <!-- Info -->
     <td><h4>PyPy</h4></td>
@@ -745,6 +745,23 @@ <h2>Project Ideas</h2>
 </tr>
 
 
+<tr>
+	<!-- Logo -->
+	<td rowspan="4" class="logo">
+		<img src="http://opensupernova.org/~wkerzend/gsoc2017/lib/exe/fetch.php?media=tardis-gsoc-2017-banner.png"
+width="300"></td>
+	<!-- Info -->
+	<td><h4>TARDIS-SN</h4></td>
+   <tr><td>TARDIS is an open-source Monte Carlo radiative-transfer spectral synthesis code for 1D models of supernova ejecta.
+   It has a fun and active community that consists of Astrophysicists, Computer Scientists and Statisticians </td></tr>
+	<tr><td><a href="http://tardis.readthedocs.io/en/latest/">Website</a> |
+      <a href="https://gitter.im/tardis-sn/gsoc2017">Contact</a> |
+		<a href="http://opensupernova.org/gsoc2017/doku.php">Ideas Page</a>
+      </td>
+   <tr><td colspan="2" class="good">Status: Ideas page finished</td></tr>
+</tr>
+
+
 <tr>
 	<!-- Logo -->
 	<td rowspan="4" class="logo">
@@ -760,24 +777,20 @@ <h2>Project Ideas</h2>
    <tr><td colspan="2" class="good">Status: Ideas page in progress</td></tr>
 </tr>
 
+
 <tr>
-	<!-- Logo -->
 	<td rowspan="4" class="logo">
-		<img src="http://opensupernova.org/~wkerzend/gsoc2017/lib/exe/fetch.php?media=tardis-gsoc-2017-banner.png"
-width="300"></td>
-	<!-- Info -->
-	<td><h4>TARDIS-SN</h4></td>
-   <tr><td>TARDIS is an open-source Monte Carlo radiative-transfer spectral synthesis code for 1D models of supernova ejecta.
-   It has a fun and active community that consists of Astrophysicists, Computer Scientists and Statisticians </td></tr>
-	<tr><td><a href="http://tardis.readthedocs.io/en/latest/">Website</a> |
-      <a href="https://gitter.im/tardis-sn/gsoc2017">Contact</a> |
-		<a href="http://opensupernova.org/gsoc2017/doku.php">Ideas Page</a>
-      </td>
+		<img src="http://timelabtechnologies.com/img/logo_300x76.PNG"></td>
+	<td><h4>Timelab</h4></td>
+	<tr><td>Time series analysis for astronomy, to study the variability in black hole emission.</td></tr>
+	<tr><td><a href="http://timelabtechnologies.com/">Website</a> |
+		<a href="mailto:gsoc@timelabtechnologies.com">gsoc@timelabtechnologies.com</a> |
+		<a href="http://stingray-slack.herokuapp.com/">Our Slack channel</a> |
+		<a href="http://timelabtechnologies.com/ideas.html">Ideas Page</a></td>
    <tr><td colspan="2" class="good">Status: Ideas page finished</td></tr>
 </tr>
 
 
-
 </table>
 
 <a name="schedule"></a>