scaffold product
remove scaffold prouduct
generate migration add type to users
Merge branch 'master' of git@github.com:robintran/ownproject.git

Conflicts:
	db/schema.rb