Merge branch 'master' into dust

Conflicts:
	public/css/style.css
	views/pages/guide.hbs