finished prob 1 and 2
resolved conflicts
Merge branch 'master' of github.com:tsc64/information_retrieval