merge
Merge branch 'master' of http://github.com/mpasko/sao_trees

Conflicts:
	SAOProject/genetic.py
	SAOProject/genetic_trees_computations.py
	SAOProject/test.py
	SAOProject/trees.py