Adds KonkordansTest and edits timing
Merge.

Merge branch 'master' of https://github.com/mheine/KTH