small update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	bin/main.rb
	radix_tree.gemspec