Latest updates.
Merge branch 'master' of https://github.com/spatarel/algos

Conflicts:
	Trie.cpp