removed kwic2 and collocate and features (retained in dev)
quickfix - library(quanteda) call was missing
testing Rstudio commits
 resolving merge conflicts
 resolving merge conflicts
Added GPL-3 license and updated version and date
chaged .gitignore
Merge branch 'master' of https://github.com/kbenoit/quanteda