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

Conflicts:
	db/schema.rb