brigid2718/goatique — pull request #17 by katiespiders (2014-10-17 00:22:31+00:00)
Title: created categories model and association with products

This doesn't appear to have any conflicts, but I created new migrations (a bunch of them because I kept making mistakes), which makes me nervous, so pull with caution, I guess?