Seeded Categories and Populated Items
Fixed Seeded Categories and Populated Items
merge
drop commit
drop commit
conflict resolution
making everything works again
trying to fix update error
Merge branch 'frontend-stuffs'
fixing update page
Merge branch 'master' of https://github.com/alicelara/luggish

Conflicts:
	app/models/user.rb
Merge branch 'master' into frontend-stuffs