changed stuff!?!?!?
Merge branch 'master' of https://github.com/hugoflug/adk_labb_1.git

Conflicts:
	Concordance.java
	ConcordanceSearcher.java