Merge branch 'master' of https://github.com/libigl/libigl

Conflicts:
	README.md

Former-commit-id: fa1a7483eeb25bebf9f9837a708a4755db8cf109

README.md

@@ -101,7 +101,6 @@ this.
 If you find bugs or have problems please use our [github issue tracking
 page](https://github.com/libigl/libigl/issues).
 
-
 ### Copyright
 2014 Alec Jacobson, Daniele Panozzo, Olga Diamanti, Kenshi
 Takayama, Leo Sacht, Wenzel Jacob, Nico Pietroni, Amir Vaxman

index.html

@@ -18,8 +18,8 @@
 <img src="tutorial/images/libigl-logo.jpg" alt="" />
 <figcaption></figcaption></figure>
 
-<p><a href="http://igl.ethz.ch/projects/libigl/">http://igl.ethz.ch/projects/libigl/</a>
-<a href="https://github.com/alecjacobson/libigl/">https://github.com/alecjacobson/libigl/</a></p>
+<p><a href="http://libigl.github.io/libigl/">http://libigl.github.io/libigl/</a>
+<a href="https://github.com/libigl/libigl/">https://github.com/libigl/libigl/</a></p>
 
 <p>Copyright 2014 - Alec Jacobson, Daniele Panozzo, Olga Diamanti, Kenshi
 Takayama, Leo Sacht, Wenzel Jacob, etc.</p>
@@ -583,7 +583,7 @@ BibTeX entry:</p>
 <pre><code class="bibtex">@misc{libigl,
   title = {{libigl}: A simple {C++} geometry processing library},
   author = {Alec Jacobson and Daniele Panozzo and others},
-  note = {http://igl.ethz.ch/projects/libigl/},
+  note = {http://libigl.github.io/libigl/},
   year = {2014},
 }
 </code></pre>