made components interaction
Merge branch 'master' of https://github.com/diplay/Project

Conflicts:
	db/seeds.rb
fixed db/seeds.rb