17/06/14
Merge branch 'master' of https://github.com/kukin-konstantin/neurotree

Conflicts:
	neurotree3/Tree.h
	neurotree3/error.txt