Merge branch 'NewMaster' into cherry

server/views/error.pug

-extends layout
-
-block content
-  h1= message
-  h2= error.status
-  pre #{error.stack}

server/views/index.pug

-extends layout
-
-block content
-  h1= title
-  p Welcome to #{title}

server/views/layout.pug

-doctype html
-html
-  head
-    title= title
-    link(rel='stylesheet', href='/stylesheets/style.css')
-  body
-    block content