Merge pull request #4 from jcolomer/danny_stan

Danny stan
seed file
Merge pull request #5 from jcolomer/Rob

seed file
Merge branch 'master' into danny_stan

Conflicts:
	db/seeds.rb