hj
Merge branch 'master' of https://github.com/QAY/algdat.git

Conflicts:
	AlgDat/src/triePackage/TrieNode.java