new tests, wordcount performance classes, commented examples
conflict
conflict solved