reworked categories, items, and item images in the seed file
Merge branch 'master' into glens_branch
Merge pull request #30 from glenegbert/glens_branch

Glens branch
solving merge coflicts