vocab is working
Merge branch 'master' of https://github.com/asapio/CV_FALL2013