coding is fun
Merge branch 'master' of github.com:tsc64/information_retrieval
finished 3b
fixed merge conflict