Merge pull request #439 from NetLogo/new-models

Adding new Conic Sections models and Interstitial Diffusion

Author: jzkelter

.gitignore

@@ -325,6 +325,7 @@ target/
 /Sample Models/Chemistry & Physics/Materials Science/Polymer Dynamics.png
 /Sample Models/Chemistry & Physics/Materials Science/Radical Polymerization with Chains.png
 /Sample Models/Chemistry & Physics/Materials Science/Solid Diffusion.png
+/Sample Models/Chemistry & Physics/Materials Science/Interstitial Diffusion.png
 /Sample Models/Chemistry & Physics/Mechanics/Random Balls.png
 /Sample Models/Chemistry & Physics/Mechanics/Unverified/Gravitation.png
 /Sample Models/Chemistry & Physics/Mechanics/Unverified/N-Bodies.png
@@ -396,8 +397,9 @@ target/
 /Sample Models/Mathematics/3D Solids.png
 /Sample Models/Mathematics/3D Surface.png
 /Sample Models/Mathematics/Color Fractions.png
-/Sample Models/Mathematics/Conic Sections 1.png
-/Sample Models/Mathematics/Conic Sections 2.png
+/Sample Models/Mathematics/Conic Sections/Emergent Shapes - Ellipse.png
+/Sample Models/Mathematics/Conic Sections/Emergent Shapes - Hyperbola.png
+/Sample Models/Mathematics/Conic Sections/Emergent Shapes - Parabola.png
 /Sample Models/Mathematics/Division.png
 /Sample Models/Mathematics/Fractals/Koch Curve.png
 /Sample Models/Mathematics/Fractals/L-System Fractals.png