working wersion
Merge branch 'master' of https://github.com/pankratovas/telemarket

Conflicts:
	db/seeds.rb