.gitignore
add test wiki with 5 pages
Merge branch 'master' of https://github.com/easten20/InformationRetrieval

# By Nicco Kunzmann (25) and others
# Via Jaeyoon Jung (2) and easten20 (1)
* 'master' of https://github.com/easten20/InformationRetrieval: (37 commits)
  cleaning up unused import lib
  add comment to regex
  add phrase clause implementation refactorization to adapt with phrase clause create TokenStream class move tokenization, stopword and stemming implementation to tokenstream
  merge conflict
  Revert "merge conflict"
  merge conflict
  big refactorization add query implementation
  MyQuery.java and Term.java by Jaeyoon
  add new domain BooleanOp, StarOp, Term add boolean query parser class (MyQuery)
  “basicpath”
  remove loops and add catch no element
  “combineIndex.java”
  added paths to other wiki files that can be generated with the python file
  removed bugs
  added getWikiPage() to Occurence
  removed conversion problem
  removed "s" at end of the tokens
  removed bug that lead to an earlz termination of the binary search
  added possibilitz to use different artikel counts
  replaced anz character with whitepace
  ...

Conflicts:
	.gitignore