user seed
Merge branch 'master' of https://github.com/brigittewarner/trailblaze

Conflicts:
	db/seeds.rb