debug
Merge branch 'master' of https://github.com/Darknautilus/insaTPinheritance

Conflicts:
	Config.h
 modif test