mth small
Merge branch 'master' of github.com:marcelTBI/treekin

Conflicts:
	calcpp.cpp