Pre-merge
Merge branch 'master' of github.com:zafartahirov/GoodrichTamassiaCpp

Conflicts:
	Ch07/Position.hpp
	Ch07/tree.hpp