Updates
Merge branch 'master' of github.com:sujankh/basics

Conflicts:
	trees/traverse/traversetree.cpp
	trees/tree/tree.h