migration changes role table
Merge branch 'table_change'

Conflicts:
	db/seeds.rb