some stuff
my message
Merge branch 'master' of https://github.com/hettema/take2

Conflicts:
	client/layout/layout.html
	lib/router.js