Vocab-Bla
merge
fixing vocabs controller