Added Trie.java
Added .gitignore
Merge branch 'master' of https://github.com/sxmanderson/minor_hacks

Conflicts:
	README.md
Added Trie