Seeds Completed. Call with 'rake db:seed'
Merge branch 'seed'

Conflicts:
	Rakefile