Schema...
Merge branch 'master' of github.com:alephtwo/bleedl

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:alephtwo/bleedl
Merge branch 'master' of github.com:alephtwo/bleedl

Conflicts:
	db/schema2.rb