fixed seed file
Merge branch 'master' of github.com:dvaughn/easyTrainer

Conflicts:
	db/seeds.rb