feat -> race and feat -> talent associations are correctly seeded
Merge branch 'master' of github.com:bobbert/age13chargen

Conflicts:
	db/seeds.rb