Endret ord
TEst

Conflicts:
	IndexMaster/src/luceneindexer/files/LuceneWriter.java
	IndexMaster/src/luceneindexer/search/SearchFlickr.java
Teit