not sure
wtf?
Merge branch 'categories'
type added to categories
seed data function written
fixed up stories controller, so it can display words based on new seed data