nGram counting
Merge remote-tracking branch 'origin/master'

Conflicts:
	Crypto/src/CountText.java