Stuffs
More changes
Merge branch 'master' of https://github.com/wd42/wd42-site

Conflicts:
	views/index.jade
	views/layout.jade