Merge branch 'master' into patch-1

Author: terriko

index.html

@@ -503,12 +503,35 @@ <h2>Project Ideas</h2>
 		<a href="https://groups.google.com/forum/#%21forum/erasproject">Mailing List</a> |
 		<a href="http://webchat.freenode.net/?channels=veras">#veras</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>
 
+<tr>
+	<!-- Logo -->
+	<td rowspan="4" class="logo">
+		<img src="http://lh3.googleusercontent.com/30U2sySIY1xqaIbEGgosUKnLzLYhOUaLkuKjCJhnjTgXD4bE86E5FOiHJqOV0nb3qUnmPTxVrw4D29pzgNToPKuS75AekeJ-=h128"
+width="128px"></td>
+	<!-- Info -->
+	<td><h4>Peragro</h4></td>
+   <tr><td>The core principle of Peragro is to make a centralized 'asset server':
+<ul>
+    <li>To stimulate collaboration between artists, by the means of tasks e.g. a texture artist can pick up where a modeller left of.</li>
+    <li>To take the job of exporting out of the artist's hand by entirely automating it.</li>
+    <li>Allow to tag assets and make collections to easily manage assets.</li>
+    <li>Share an art repository between projects to reuse common assets, tag or group assets to be more settings or project specific.</li>
+    <li>Deliver and accept its content in the format requested/provided by the user as to support multiple tools so assets can be freely distributed between artist and each can use their program of choice.</li>
+    <li>Deliver its content in the format requested by the engine, projects might use CS, Ogre or 2D, etc representations of assets.</li>
+	</ul>
+</td></tr>
+	<tr><td><a href="http://peragro.org">Website</a> |
+      <a href="https://github.com/peragro/peragro/wiki/Getting-Started">Contact</a> |
+		<a href="https://github.com/peragro/peragro/wiki/GSoC-Ideas">Ideas Page</a>
 
+      </td>
+   <tr><td colspan="2" class="good">Status: Ideas page in progress</td></tr>
+</tr>
 </table>
 
 <a name="schedule" />