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

Former-commit-id: af3dcc56939390533154df62ee473d3f9c2928f4

google-soc/index.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8"/>
 	<title>libigl</title>
 	<meta name="author" content="Alec Jacobson and Daniele Panozzo and others"/>
-	<link type="text/css" rel="stylesheet" href="tutorial/style.css"/>
+	<link type="text/css" rel="stylesheet" href="../tutorial/style.css"/>
 <script type='text/javascript' src='http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'></script>
 <link rel='stylesheet' href='http://yandex.st/highlightjs/7.3/styles/default.min.css'>
 <script src='http://yandex.st/highlightjs/7.3/highlight.min.js'></script>