fridays work
fixed merge conflicts
fixed merge conflicts
added join tables categoies_words and lists_words