Merge branch 'master' of git.cryto.net:Squatconf/Website

package.json

@@ -19,13 +19,14 @@
   },
   "homepage": "https://github.com/squatconf/website",
   "dependencies": {
-    "ecstatic": "^1.4.0",
     "handlebars": "^4.0.5",
-    "nodemon": "^1.9.1",
     "remarkable": "^1.6.2"
   },
   "scripts": {
     "build": "node ./scripts/build.js",
     "watch": "nodemon -w src -e md,hbs -x npm run build"
+  },
+  "devDependencies": {
+    "nodemon": "^1.9.1"
   }
 }

server.js

@@ -1,15 +0,0 @@
-#!/usr/bin/env node
-
-var ecstatic = require('ecstatic')
-  , port = 8000
-  , app = require('http').createServer(
-      ecstatic({ root: __dirname + '/public' })
-  ).listen(port, function () {
-    console.log('Listening on http://localhost:' + port)
-  })
-;
-
-process.on('uncaughtException', function (err) {
-  console.error('Error at:', new Date)
-  console.error(err.stack)
-})

src/index.hbs

@@ -147,5 +147,5 @@
     </div>
   </div>
 </body>
-
 </html>
+<!-- useless comment to check if it is rebuilt corrrectly -->

src/index.md

@@ -47,4 +47,4 @@ if you tell before so that we have an idea on how many people need accomodation.
 
 ## I want to give a talk!
 
-Please see [our talks repository](https://git.cryto.net/Squatconf/Talks/pulls) to propose a talk.
+Please see [our talks repository](https://git.cryto.net/Squatconf/Talks) to propose a talk.