stupid stuff

blah
Merge branch 'master' of https://github.com/Daustoe/tree

Conflicts:
	avl_tree.py
Merge branch 'master' of https://github.com/Daustoe/tree