API changed
Merge branch 'master' of work.github.com:shichao-an/practice

Conflicts:
	tree/diameter.c
	tree/diameter.h
	tree/tree.c
	tree/tree.h