seed failing on heroku
Merge branch 'master' of heroku.com:conference-scheduler

Conflicts:
	db/seeds.rb