+ additional argument
Merge branch 'master' of https://github.com/paradoxon-at/information-retrieval

Conflicts:
	Exercise1/trunk/src/at/ac/tuwien/ir/indexer/Indexer.java
	Exercise1/trunk/src/at/ac/tuwien/ir/indexer/Parser.java
~ merged