Merge pull request #16 from lukemesiti/tags

Fixed schema conflict, looks good :)
seeds made, haven't run yet
Merge branch 'master' into lauren
Fixed Events table column type, changed to 'category.'
Changed type reference to category inside events controller, events form, events show page, and events list page.
Added seed file.
Merge pull request #17 from lukemesiti/lauren

Awesome work on this, Lauren!