cb wip
Merge branch 'master' of github.com:k41n/dnd

Conflicts:
	app/views/layouts/application.html.slim
cb wip