Merge branch 'master' into master

Author: terriko

index.html

@@ -435,7 +435,7 @@ <h2>Project Ideas</h2>
 
 <table class="ideas">
 <!-- Sub-org Info.  Please alphabetize when you add a new org -->
-<!-- Removing Core Python until ideas page is ready   
+<!-- Removing Core Python until ideas page is ready
 <tr>
 	<td rowspan="4" class="logo">
 		<img src="http://python.org/images/python-logo.gif"></td>
@@ -477,14 +477,14 @@ <h2>Project Ideas</h2>
 width="300"></td>
 	<!-- Info -->
 	<td><h4>The Italian Mars Society</h4></td>
-   <tr><td>Mars City main goal is to provide an effective test bed for field operation studies 
-	   in preparation for human missions to Mars. We are currently working on an immersive 
+   <tr><td>Mars City main goal is to provide an effective test bed for field operation studies
+	   in preparation for human missions to Mars. We are currently working on an immersive
 	   virtual reality simulation of the Mars City Station (V-MARS). </td></tr>
 	<tr><td><a href="http://www.mars-city.org/">Website</a> |
 		<a href="https://groups.google.com/forum/#%21forum/marscity">Mailing List</a> |
 		<a href="http://webchat.freenode.net/?channels=marscity">#marscity</a> on <a
 href="http://www.freenode.net/">Freenode</a> |
-		<a href="http://ims-gsoc.org/">Ideas Page</a>    
+		<a href="http://ims-gsoc.org/">Ideas Page</a>
       </td>
    <tr><td colspan="2" class="good">Status: Ideas page in progress</td></tr>
 </tr>
@@ -496,8 +496,8 @@ <h2>Project Ideas</h2>
 width="128"></td>
   <!-- Info -->
   <td><h4>Kivy Organization</h4></td>
-   <tr><td>Kivy is a cross-platform, business friendly, GPU accelerated Python 
-   library for rapid development of applications that make use of innovative 
+   <tr><td>Kivy is a cross-platform, business friendly, GPU accelerated Python
+   library for rapid development of applications that make use of innovative
    user interfaces, such as multi-touch apps.
 
    The Kivy Organization oversees several major projects:
@@ -583,6 +583,28 @@ <h2>Project Ideas</h2>
 
       </td>
    <tr><td colspan="2" class="good">Status: Ideas page in progress</td></tr>
+
+<tr>
+    <!-- Logo -->
+    <td rowspan="4" class="logo">
+        <img src="http://pypy.org/image/pypy-logo2-white-background.png" 
+             width="300px"></td>
+    <!-- Info -->
+    <td><h4>PyPy</h4></td>
+    <tr><td><p>PyPy is a fast, compliant alternative implementation of the Python language.</p>
+               It is separated in many independant layers, one can work on each separatly.
+               Some areas offer rather challenging topics (such as JIT compilation, Optimization, ...),
+               others do not have such a steep learning curve.</p>
+       </td></tr>
+   <tr><td><a href="http://pypy.org/">Website</a> |
+           <a href="https://webchat.freenode.net/">Contact: IRC Channel #pypy</a> |
+           <a href="http://pypy.readthedocs.io/en/latest/how-to-contribute.html">Contribution Guidelines</a> |
+           <a href="http://pypy.readthedocs.io/en/latest/project-ideas.html">Ideas Page</a>
+   </td>
+   <tr><td colspan="2" class="good">Status: Ideas page in progress</td></tr>
+</tr>
+
+<tr>
         <!-- Logo -->
         <td rowspan="4" class="logo">
                 <img
@@ -597,6 +619,7 @@ <h2>Project Ideas</h2>
 </tr>
 
 
+
 <tr>
 	<!-- Logo -->
 	<td rowspan="4" class="logo">
@@ -636,7 +659,7 @@ <h2>Project Ideas</h2>
 <tr>
 	<!-- Logo -->
 	<td rowspan="4" class="logo">
-		<img src="http://www.statsmodels.org/devel/_static/statsmodels_hybi_favico.ico" 
+		<img src="http://www.statsmodels.org/devel/_static/statsmodels_hybi_favico.ico"
 		     width="120"></td>
 	<!-- Info -->
 	<td><h4>Statsmodels</h4></td>
@@ -664,27 +687,24 @@ <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://pypy.org/image/pypy-logo2-white-background.png" 
-             width="300px"></td>
-    <!-- Info -->
-    <td><h4>PyPy</h4></td>
-    <tr><td><p>PyPy is a fast, compliant alternative implementation of the Python language.</p>
-               It is separated in many independant layers, one can work on each separatly.
-               Some areas offer rather challenging topics (such as JIT compilation, Optimization, ...),
-               others do not have such a steep learning curve.</p>
-       </td></tr>
-   <tr><td><a href="http://pypy.org/">Website</a> |
-           <a href="https://webchat.freenode.net/">Contact: IRC Channel #pypy</a> |
-           <a href="http://pypy.readthedocs.io/en/latest/how-to-contribute.html">Contribution Guidelines</a> |
-           <a href="http://pypy.readthedocs.io/en/latest/project-ideas.html">Ideas Page</a>
-   </td>
-   <tr><td colspan="2" class="good">Status: Ideas page in progress</td></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>
 
+
+
 </table>
 
 <a name="schedule"></a>